Bug 974540 - Fix nsMemoryReporterManager child count for Nuwa. r=khuey
Bug 974825 - Fix hang in libpng16 with zero-length IDAT. r=jmuizelaar
Automatic merge