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)
1  2 
xbmc/Util.cpp

diff --cc xbmc/Util.cpp
Simple merge