Commit [4c03e2]  Maximize  Restore  History

Merge commit '2.3.12' into crawl

Conflicts:
.gitignore
builds/win32/vc2005/freetype.vcproj

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

Steven Noonan Steven Noonan 2010-02-22