Commit [82d02e]  Maximize  Restore  History

Merge remote branch 'upstream/master'

Conflicts:
rcfile_y.y

Ben Kibbey Ben Kibbey 2010-05-24