Creating branch from maintenance-2.2 r7540 for work on task 150306 (fix bug 2024248).
Authored by: bbranan 2008-08-04
Parent: [r7647]
Child: [r7649]