enhancement - resolved conflicting version, adding functionality to the release version

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@10043 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
automatically synchronized identical files to revision 10043

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