Merge from vendor branch TNF:
authortnn <tnn>
Tue, 19 Apr 2011 11:16:12 +0000 (11:16 +0000)
committertnn <tnn>
Tue, 19 Apr 2011 11:16:12 +0000 (11:16 +0000)
commit655dd290dd61eaa2d25fd2414cabbe3f52d6d7d1
tree35a27625cce7b1694477fa4fa7563d6b816654d5
parentd12684cf50138b112eb71f439785439e7cd886b6
parentdb9427b5e13cbf4d9442d4e366179472d2aac213
Merge from vendor branch TNF:
Re-import previous version of Firefox, because firefox-4.0 won't
work for some users (sparc64 support, for example, is busted and
won't appear again until firefox-5.0).