Merge von Pfingst auf Head: merge15 -> merge16
Authored by: lohaus 2007-10-05
Parent: [r3141]
Child: [r3143]