Merge branch 'master' of https://vcs.maemo.org/git/vlc-remote
authorYann Nave <ynave@ynave-laptop.(none)>
Sat, 7 Aug 2010 20:22:56 +0000 (22:22 +0200)
committerYann Nave <ynave@ynave-laptop.(none)>
Sat, 7 Aug 2010 20:22:56 +0000 (22:22 +0200)

Trivial merge