cgjones/mozilla-central — pull request #25 by philikon (2011-12-23 00:45:26+00:00)
Title: Merge upstream mozilla-central to the B2G gecko fork

The B2G gecko fork was horribly out of date, so I merged upstream mozilla-central again. Got a conflict on hal/gonk/GonkHal.cpp that I manually resolved by preferring the version that landed in mozilla-central. This would not build, had to fix a minor issue. See bug 713149 and the top most commit in this pull request. It compiles and I'm about to try it out on a phone, too.