Patch by chpe@gnome.org r=marco sr=blizzard git-svn-id: svn://10.0.0.236/trunk@167897 18797224-902f-48f8-a5cc-f745e15eee43