Merge branch 'master' of git://github.com/xbmc/xbmc
authorGeorge Yunaev <gyunaev@ulduzsoft.com>
Fri, 16 Dec 2011 00:51:44 +0000 (16:51 -0800)
committerGeorge Yunaev <gyunaev@ulduzsoft.com>
Fri, 16 Dec 2011 00:51:44 +0000 (16:51 -0800)

Trivial merge