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

[Jon Ciesla]

commit 28f72770d7dde82a4155e00d8746ba243fdb14cd
Merge: 74dbc5c a85ef8d
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Jun 14 08:07:06 2012 -0500

    Merge branch 'f17' into f16
    
    Conflicts:
    	.gitignore
    	python-celery.spec
    	sources

 .gitignore         |    3 +--
 python-celery.spec |    8 +++++++-
 sources            |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index dc0c9ca,ffb46bc..3306584
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,1 @@@
--/celery-2.2.7.tar.gz
--/celery-2.2.8.tar.gz
+ /celery-2.5.5.tar.gz