[bodhi/f13: 3/3] Merge branch 'master' into f13

[Luke Macken]

commit 62bb261692ce6b604c8212f84f0700ab573f45e9
Merge: 8aecb05 f96253f
Author: Luke Macken <lmacken at redhat.com>
Date:   Thu Jun 9 16:18:38 2011 -0400

    Merge branch 'master' into f13

 .gitignore |    2 ++
 bodhi.spec |    8 +++++++-
 sources    |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---