Bug 847382:  Fix XULRunner SDK builds.  r=glandium
Backed out changeset 015da7030aab (bug 847382) for not following the tree rules (watching/starring mozilla-central after pushing) DONTBUILD
Bug 846158 - Clear mEventReceived in robocop blockForEvent; r=kats
Merge mozilla-central to mozilla-inbound