Bug 839786 - Print a more useful message for mach clobber errors [r=gps]
Bug 841451 - Fix build problems in metro/commandexecutehandler [r=jimm]