eb8a6c
Merge remote branch 'origin/f12/master' Conflicts: .gitignore appliance-tools.spec Signed-off-by: Adam Tkac <atkac@redhat.com>