Update to SDL2 snapshot 2013-06-06 (rev 7291).
Update to SDL_image snapshot 2013-06-06 (rev 397).
Merge branch 'master' into raring