cgjones/mozilla-central — pull request #39 by jonallengriffin (2012-03-22 00:19:51+00:00)
Title: Update Marionette

Marionette is going to land in m-c soon. This pull requests syncs cgjones/mozilla-central with that commit. You should merge this pull request before merging an m-c that contains the landed Marionette, in order to avoid a lot of merge pain.