Merge branch 'master' of https://vcs.maemo.org/git/vlc-remote
authoryannux <yannux@onbebop.net>
Thu, 19 Aug 2010 07:04:50 +0000 (09:04 +0200)
committeryannux <yannux@onbebop.net>
Thu, 19 Aug 2010 07:04:50 +0000 (09:04 +0200)

Trivial merge