[python-celery/f15: 7/7] Merge branch 'f16' into f15

[Jon Ciesla]

commit 4ac9d8f9bfdc0977a61545795da381eebc8342bf
Merge: 239b107 28f7277
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Jun 14 08:09:21 2012 -0500

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

 .gitignore         |    3 +--
 python-celery.spec |    8 +++++++-
 sources            |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
---