The xpcom tree remains closed, but this patch gets in for m6 by special dispensation. A=leaf,dp git-svn-id: svn://10.0.0.236/trunk@32011 18797224-902f-48f8-a5cc-f745e15eee43