Bug 840315 - Emulator update for font support, r=mwu
Bug 840315 - Change default serif and sans serif fonts on gonk, r=jfkthame a=blocking-leo
Merge m-c to birch.
Bug 861085 - Enable/Disable Bluetooth based on mozSettings value at startup, r=gyeh, r=qdot
Bug 857896 - Convert device property "Connected" into a boolean if bluez returns a two-byte array, r=echou,qdot
Merge m-c to inbound.
Bug 857252 - testing-modules-dir is not defined. r=gps
Bug 862228 - Move a RootedPropertyName to the proper place.
Bug 848935 - requestLongerTimeout for intermittent failure in browser_aboutHome.js
Bug 843865 - Fix >> in code. r=bz
Bug 861790 - Fix unused function TypeIsFloatingPoint/TypeIsUnsigned in ObjectImpl.h. r=jwalden

--HG--
extra : rebase_source : 0ee1b49909e370983cba448480fc28741a0879bd
Bug 861181: Separate interface from implementation for nsColumnSetFrame. [r=roc]
Bug 861182: Pull knownFeasibleHeight and knownInfeasibleHeight into ReflowConfig so they can be used outside of nsColumnSetFrame::Reflow(). [r=roc]