Bug 1058105 - Fix a typo in placesNodeAnnotationChanged; r=mconley

--HG--
extra : rebase_source : 5e04a73997a6d62d5664e350c42a284f8879e0ba
Bug 1057393 - Fix a regression on octane-zlib; r=sfink

--HG--
extra : rebase_source : 3ecf3f741cb5264a426c6edf97ce59184ae6cd34