[bodhi/f14: 2/2] Merge branch 'master' into f14

[Luke Macken]

commit a3a6acd1d9bf8783a11ac1f66409aeda4b5a4553
Merge: 771ad1b 3c74f0e
Author: Luke Macken <lmacken at redhat.com>
Date:   Wed Nov 16 16:07:36 2011 -0500

    Merge branch 'master' into f14

 .gitignore |    1 +
 bodhi.spec |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---