Bug 886418 - Add MOZJS_{MAJOR,MINOR}_VERSION to js-config.h so that JSAPI differences can be handled at compile time. r=glandium

--HG--
extra : rebase_source : 20d442b10d3facd30d0eaaa603214038eed72baf
Bug 873054 - Disable FHR prefs checkbox if pref is locked; r=rnewman
Bug 884865 - If sites provide a large favicon, use it alone for homescreen shortcuts. r=mfinkle
Bug 884865 - Provide a way to get unscaled favicons from the Java favicon service. r=margaret