[bodhi/f13/master: 44/45] Merge branch 'f14' into f13

[Luke Macken]

commit 3fcee4bf4e72a5bbdab97fe172162c47e9356a22
Merge: 0765107 4378633
Author: Luke Macken <lmacken at redhat.com>
Date:   Mon Jan 10 14:36:26 2011 -0500

    Merge branch 'f14' into f13
    
    Conflicts:
    	.gitignore
    	bodhi.spec
    	sources

 .gitignore |    4 ++++
 bodhi.spec |   44 ++++++++++++++++++++++++++++++++++++++------
 sources    |    2 +-
 3 files changed, 43 insertions(+), 7 deletions(-)
---
diff --cc bodhi.spec
index 220b580,5b2eced..2cc1f71
--- a/bodhi.spec
+++ b/bodhi.spec
@@@ -16,9 -16,11 +16,12 @@@ BuildArch:      noarc
  BuildRequires: python-setuptools 
  BuildRequires: python-setuptools-devel
  BuildRequires: python-devel
 +
- BuildRequires: TurboGears python-bugzilla
- BuildRequires: python-fedora python-TurboMail TurboGears yum koji
+ BuildRequires: TurboGears
+ BuildRequires: python-TurboMail
+ BuildRequires: python-bugzilla
+ BuildRequires: python-fedora
+ BuildRequires: yum koji
  
  %description
  Bodhi is a web application that facilitates the process of publishing