Automated merge with ssh://hg@bitbucket.org/tarek/distribute/

--HG--
branch : distribute
extra : rebase_source : a5d249ee72165276d28a391a3f410da7de09c970

MANIFEST.in

 recursive-include setuptools *.py *.txt *.exe
 recursive-include tests *.py *.c *.pyx *.txt
-recursive-include docs *.py *.txt Makefile
+recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile
 include *.py
 include *.txt
 include MANIFEST.in