Merge Cadenza_3-9-0_2007-06-08_merge12 -> 13
Authored by: caserta 2007-09-13
Parent: [r3070]
Child: [r3072]