Bug 1059992 - ALL b2g builds exceeding buildbot output limits r=catlee
Bug 1014659 - Move cppunit tests to their own test package; r=jlund
Merging from default

changeset:   3131:d6c4ce5b963e
parent:      3126:5675ff8803dd
user:        John Ford <jhford@mozilla.com>
date:        Wed Sep 03 12:11:46 2014 +0200
summary:     Bug 1059992 - ALL b2g builds exceeding buildbot output limits r=catlee

changeset:   3132:279414b34e2c
user:        Dan Minor <dminor@mozilla.com>
date:        Wed Sep 03 08:22:45 2014 -0400
summary:     Bug 1014659 - Move cppunit tests to their own test package; r=jlund

--HG--
branch : production