grim/guifications2

grim/guifications2/
Merge backout of ChangeLog entries.

2009-09-23, John Bailey
7c432b43d7fb