Bug 967354 - Fix incorrect usage of UpdateWebGLErrorAndClearGLError(); r=jgilbert, a=1.2.x+
Bug 1005552 - Fuss around with marquee some more. r=bz, a=1.2.x+
Merge b2g26 to v1.2f. a=merge