Bug 949600 - Sync mozbase to m-c one last time, r=wlach