Merge branch 'master' of https://github.com/thefiddler/opentk into modes
authorparallels <parallels@parallels-Parallels-Virtual-Platform.(none)>
Sat, 9 Nov 2013 16:17:22 +0000 (17:17 +0100)
committerparallels <parallels@parallels-Parallels-Virtual-Platform.(none)>
Sat, 9 Nov 2013 16:17:22 +0000 (17:17 +0100)

Trivial merge