Commit [66a592] Maximize Restore History

Merge branch 'master' into fpga

ckolivas ckolivas 2012-01-18