Merge pull request #52 from UweBonnes/master
authortexane <texane@gmail.com>
Tue, 31 Jan 2012 17:11:35 +0000 (09:11 -0800)
committertexane <texane@gmail.com>
Tue, 31 Jan 2012 17:11:35 +0000 (09:11 -0800)
Fixes around F4


Trivial merge