Merge Taoki's 3D player improvements
authorPerttu Ahola <celeron55@gmail.com>
Tue, 27 Nov 2012 06:15:38 +0000 (08:15 +0200)
committerPerttu Ahola <celeron55@gmail.com>
Tue, 27 Nov 2012 06:15:38 +0000 (08:15 +0200)

Trivial merge