git-svn-id: svn://10.0.0.236/trunk@229896 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@226262 18797224-902f-48f8-a5cc-f745e15eee43
Patch by Marc Schumann <wurblzap@gmail.com>; r=myk,mkanat; a=myk git-svn-id: svn://10.0.0.236/trunk@209287 18797224-902f-48f8-a5cc-f745e15eee43