3a27ad0
Merge remote branch 'origin/master' into f14 Conflicts: git.spec Signed-off-by: Adam Tkac <atkac@redhat.com>