Merge branch 'master' of github.com:xbmc/xbmc
authorFneufneu <fneufneu@xbmc.org>
Thu, 9 Jun 2011 10:15:03 +0000 (12:15 +0200)
committerFneufneu <fneufneu@xbmc.org>
Thu, 9 Jun 2011 10:15:03 +0000 (12:15 +0200)

Trivial merge