Bug 920292 - Part 1: Stop passing string literals as the first argument to MOZ_ASSERT; r=Waldo
Bug 922190 - Remove bundled copy of simplejson. r=gps

--HG--
extra : rebase_source : 5d33bafacd732e6bfb7acb6bb4d171eabb7d258a