partially undoing last commit, possibly there is a bug; i need to check first


git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@8846 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0