-> Merged rev. 545:546 from branch-1.0 into trunk
Authored by: raoul 2006-12-22
Parent: [r546]
Child: [r548]