Hammertime!
Merge pull request #167 from kleinerm/master

Hammertime!
Merge pull request #168 from Psychtoolbox-3/master

PTB BETA RELEASE "Hammertime!" SP1

Stop! Hammertime! :-)