merged: bug fix from trunk. r25638
authorvdrfan <vdrfan@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 13 Dec 2009 11:04:04 +0000 (11:04 +0000)
committervdrfan <vdrfan@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 13 Dec 2009 11:04:04 +0000 (11:04 +0000)
commit0ebeb223a03340534837358c64c4099ef47855b4
treee5cb7d24fadeddbbe2ff7a4b19d095ae3d90b5bc
parent3e204be4c0df87bcb52e3c018c41e38901ad66c7
merged: bug fix from trunk. r25638

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/9.11_Camelot@25639 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
xbmc/Util.cpp