Merge ~> Cadenza_3-8-0_2006-10-25_Merge20
Authored by: gebhard 2007-01-05
Parent: [r2300]
Child: [r2302]