grim/guifications2

grim/guifications2/
merge of '1badae128249834bf59200058c59315e840fbfd4'
org.guifications.gf2
2007-06-05, John Bailey
c274052e808b