merged: bug fixes from trunk, r25757,r25782,r25863
authorjmarshallnz <jmarshallnz@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 20 Dec 2009 22:00:51 +0000 (22:00 +0000)
committerjmarshallnz <jmarshallnz@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 20 Dec 2009 22:00:51 +0000 (22:00 +0000)
commit1a53e6b48ea3baabebf8be988f0679dbbd15f5f3
treeaf3e164bb831a1aff12614bb7644a6612c67087d
parentdfc1e4cd0b124e478d6b008e519a47fd5182e8a2
merged: bug fixes from trunk, r25757,r25782,r25863

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/9.11_Camelot@25902 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
skin/Confluence/720p/FileBrowser.xml
skin/Confluence/720p/VideoOSDSettings.xml
tools/TexturePacker/XBMCTex.cpp
xbmc/PowerManager.cpp