v bump
Merge branch 'master' of https://github.com/rdp/mplayer-svn