merged temporary svn17 repo into default repo
Authored by: bittorf 2012-09-18
Parent: [r5455]
Child: [r5457]