Dependency on latest python module six makes unfeasible to run soledad tests

How to reproduce:

@git clone git://github.com/leapcode/soledad.git@

@cd soledad/@

@for i in common client server; do cd $i && python setup.py develop && cd ..; done@

@cd common/@

@python setup.py test -s leap.soledad.common.tests.test_server@

I get the following:

Traceback (most recent call last):
  File "setup.py", line 71, in 
    'couchdb': ['couchdb'],
  File "/usr/lib/python2.7/distutils/core.py", line 152, in setup
    dist.run_commands()
  File "/usr/lib/python2.7/distutils/dist.py", line 953, in run_commands
    self.run_command(cmd)
  File "/usr/lib/python2.7/distutils/dist.py", line 972, in run_command
    cmd_obj.run()
  File "/tmp/tmp.0LiHKsGGKG/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/command/test.py", line 129, in run
    self.distribution.fetch_build_eggs(self.distribution.tests_require)
  File "/tmp/tmp.0LiHKsGGKG/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/setuptools/dist.py", line 245, in fetch_build_eggs
    parse_requirements(requires), installer=self.fetch_build_egg
  File "/tmp/tmp.0LiHKsGGKG/local/lib/python2.7/site-packages/distribute-0.6.24-py2.7.egg/pkg_resources.py", line 588, in resolve
    raise VersionConflict(dist,req) # XXX put more info here
pkg_resources.VersionConflict: (six 1.4.1 (/tmp/tmp.0LiHKsGGKG/lib/python2.7/site-packages/six-1.4.1-py2.7.egg), Requirement.parse('six>=1.1,<1.4'))

After uninstalling six 1.4 and installing six 1.1, everything works fine.

(from redmine: created on 2013-10-23, closed on 2013-11-25)