This commit was manufactured by cvs2svn to create tag
'Cadenza_3-11_merge04'.
Authored by: cvs2svn 2008-03-07
Parent: [r3474]
Child: [r3476]