temporary fix parallel shanchen
Merge branch 'master' of git://github.com/espressomd/espresso into shanchen
Merge pull request #112 from Marcello-Sega/shanchen

fix for the parallel test