merged release-2.2.4 branch down to maintenance-2.2
Authored by: cwilper 2008-10-24
Parent: [r7810]
Child: [r7812]