Commit [ee1d44] Maximize Restore History

Merge branch 'master' of github.com:cryos/avogadro

Conflicts:
CMakeLists.txt
avogadro/src/CMakeLists.txt
libavogadro/src/CMakeLists.txt
libavogadro/src/colors/CMakeLists.txt
libavogadro/src/elementitem_p.cpp
libavogadro/src/tools/CMakeLists.txt
periodictable/src/qperiodictable.cpp

Geoff Hutchison Geoff Hutchison 2010-06-04