Merge: IMS_2005-09-19_Merge19 -> Merge20
Authored by: gebhard 2006-06-21
Parent: [r1757]
Child: [r1759]