grim/guifications2

merge of '791c134efca0667e4c987db12a3a85a78f26cb57'
org.guifications.gf2
2009-04-05, Gary Kramlich
42aa4009a621
merge of '791c134efca0667e4c987db12a3a85a78f26cb57'
and '7cd0ee0e49a6622bcb1ebfd171d0ca1815f36793'
For all news and changes please see the ChangeLog