cgjones/mozilla-central — pull request #27 by jonallengriffin (2012-01-13 21:35:31+00:00)
Title: Update Marionette

@malini

A bad merge in cgjones/mozilla-central removed the prefs that allow Marionette to start. This fixes that, plus pulls in the latest Marionette code changes.