Merge branch 'patch-sdl'
authorJean Privat <jean@pryen.org>
Wed, 12 Feb 2014 13:50:44 +0000 (08:50 -0500)
committerJean Privat <jean@pryen.org>
Wed, 12 Feb 2014 13:50:44 +0000 (08:50 -0500)

Trivial merge