Merge branch 'master' of git@github.com:xbmc/xbmc
authorPhaeodaria <phaeodaria@xbmc.org>
Fri, 28 Jan 2011 20:03:53 +0000 (12:03 -0800)
committerPhaeodaria <phaeodaria@xbmc.org>
Fri, 28 Jan 2011 20:03:53 +0000 (12:03 -0800)
commit8e98a4c25ea0b6d4e1779cc034265257f9f4f24e
treec811ed9d7351b7f7485adfe2eae9e3a8d54e750b
parent1d18af5c4f8ba3f771a7d8a4df6742f6b7d18449
parent73fb882455b2d70c04bf53520ab5eb6c2bfdca55
Merge branch 'master' of git@github.com:xbmc/xbmc