patch by ajvincent@gmail.com r=timeless rs=brendan a=chofmann git-svn-id: svn://10.0.0.236/trunk@174115 18797224-902f-48f8-a5cc-f745e15eee43
patch by ajvincent@gmail.com r=timeless rs=brendan a=chofmann git-svn-id: svn://10.0.0.236/trunk@174115 18797224-902f-48f8-a5cc-f745e15eee43