Merge: Cadenza_3-6-0_2006-03-24_merge_02 -> Cadenza_3-6-0_2006-03-24_merge_03
Authored by: gebhard 2006-04-13
Parent: [r1658]
Child: [r1660]