Merge branch 'master' of github.com:xbmc/xbmc
authorJohn Rennie <john.rennie@ratsauce.co.uk>
Wed, 2 Feb 2011 07:45:12 +0000 (07:45 +0000)
committerJohn Rennie <john.rennie@ratsauce.co.uk>
Wed, 2 Feb 2011 07:45:12 +0000 (07:45 +0000)

Trivial merge