Merge authors update from trunk.
Authored by: klaussfreire 2012-05-12
Parent: [r13377]
Child: [r13379]