Bug 832942: work around an ARMv6 code generation bug in gcc 4.6. r=wtc.

--HG--
extra : source : f37f4a6ba90b8add8792fa15812ba25d176b96b7
Bug 841135: Remove the marketplace test root cert, r=honzab

--HG--
extra : source : cad6855a3b4a862989873ef30675a115c4341ce1