manual import of developer svn broke trunk, fixed
Authored by: burmagroup 2013-05-10
Parent: [r1159]
Child: [r1161]