Checkin for Eric Olson <Eric.Olson@Sympatico.CA> and Henry <sobotka@axess.com>.
git-svn-id: svn://10.0.0.236/trunk@14963 18797224-902f-48f8-a5cc-f745e15eee43
branch is a temporary branch for us to copy the latest changes
from our internal development tree to the public mozilla tree.
git-svn-id: svn://10.0.0.236/trunk@1624 18797224-902f-48f8-a5cc-f745e15eee43