merged: bug fixes from trunk. r25621, r25624, r25626
authorjmarshallnz <jmarshallnz@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 13 Dec 2009 05:08:19 +0000 (05:08 +0000)
committerjmarshallnz <jmarshallnz@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 13 Dec 2009 05:08:19 +0000 (05:08 +0000)
commit611c1636fce2dede971a605e01ce15d8532f3697
tree19c7bfc9475ef84c4d0d4742792e0955219f69e2
parente2304622467fa5d92d89aa608a0eb01655b0d1f6
merged: bug fixes from trunk. r25621, r25624, r25626

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/9.11_Camelot@25627 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
guilib/GUITextLayout.cpp
skin/Confluence/720p/LoginScreen.xml
xbmc/GUIWindowMusicNav.cpp
xbmc/GUIWindowMusicNav.h