Merge remote branch 'upstream/master'
authorLars Op den Kamp <lars@opdenkamp.eu>
Sun, 16 Jan 2011 22:15:36 +0000 (23:15 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sun, 16 Jan 2011 22:15:36 +0000 (23:15 +0100)
commit0be24733539c14f5f3df97cb8dfb15f2cf86dadc
treeeb2dd674bc41ca60b4a7663cc411782608a5dcc4
parent24e16ab518b3fa9a9a82c93a55c33a2c25f3e2f3
parenta2ce3227f46aa2b967391ec0a08bfb51d0b3bc5a
Merge remote branch 'upstream/master'
xbmc/Util.cpp