[python-celery/f16: 2/2] Merge branch 'f17' into f16

Thu Jun 14 14:29:37 UTC 2012

commit 7da22c445eb066c1d483f697e877f4d37d951bb6
Merge: 28f7277 b5c577f
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Jun 14 09:29:28 2012 -0500

    Merge branch 'f17' into f16
    
    Conflicts:
    	.gitignore

 .gitignore         |    3 ++-
 python-celery.spec |    7 ++-----
 sources            |    2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)
---