patch by mcalmus@nyx.net r=dveditz sr=brendan a=dveditz git-svn-id: svn://10.0.0.236/trunk@152754 18797224-902f-48f8-a5cc-f745e15eee43
patch by mcalmus@nyx.net r=dveditz sr=brendan a=dveditz git-svn-id: svn://10.0.0.236/trunk@152754 18797224-902f-48f8-a5cc-f745e15eee43