[python-tgext-admin/el5: 11/11] Merge branch 'master' into el5

[Luke Macken]

commit c13f4e7787bccaf543d5767eef486fe771fdb21b
Merge: e327ff2 dfd2a10
Author: Luke Macken <lmacken at redhat.com>
Date:   Thu Nov 10 12:52:18 2011 -0500

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	python-tgext-admin.spec
    	sources

 .gitignore              |    2 ++
 python-tgext-admin.spec |   21 +++++++++++++++++++--
 sources                 |    2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)
---
diff --cc python-tgext-admin.spec
index 50ebfc4,ef989b7..e92db5f
--- a/python-tgext-admin.spec
+++ b/python-tgext-admin.spec
@@@ -15,7 -15,8 +15,9 @@@ BuildArch:      noarc
  
  BuildRequires:  python-setuptools-devel python-devel
  #BuildRequires:  python-tgext-crud python-nose TurboGears2
 +Requires:       python-tgext-crud
+ Requires:       python-sprox >= 0.6.4
+ Requires:       python-tgext-crud >= 0.3.7
  
  %description
  Admin Controller add-on for basic TG identity model.