- merged rev. 953 from trunk (partially closes bug #2071875)
Authored by: thzs 2008-08-28
Parent: [r953]
Child: [r955]