Commit [836a32]  Maximize  Restore  History

Merge latest green birch changeset and mozilla-central

Ed Morley Ed Morley 2013-06-06