Merge pull request #11 from Psychtoolbox-3/master

Resync with PTB BETA RELEASE "The fun in dysfunction"

Up to date as of 4-January-2013.