Commit [7aa110] merge-upstream Maximize Restore History

Merge branch 'master' into merge-upstream

Chen Yufei Chen Yufei 2011-01-10