Merge branch 'master' of https://code.google.com/p/supertux
authorCT. da'Bomb <ct.dabomb@yahoo.com>
Wed, 15 Aug 2012 18:26:45 +0000 (13:26 -0500)
committerCT. da'Bomb <ct.dabomb@yahoo.com>
Wed, 15 Aug 2012 18:26:45 +0000 (13:26 -0500)

Trivial merge