Merge branch 'master' of https://vcs.maemo.org/git/vlc-remote
authoryannux <yannux@onbebop.net>
Wed, 25 Aug 2010 08:18:21 +0000 (10:18 +0200)
committeryannux <yannux@onbebop.net>
Wed, 25 Aug 2010 08:18:21 +0000 (10:18 +0200)

Trivial merge