Merge ~> Cadenza_3-8-0_2006-10-25_Merge11
Authored by: gebhard 2006-11-22
Parent: [r2179]
Child: [r2181]