Commit [195dbb]  Maximize  Restore  History

Merge branch 'master' into bfast2

Nils Homer Nils Homer 2010-08-04