Integrate 'configuration'-branch into trunk
Authored by: ozzy.ext 2011-10-31
Parent: [r384]
Child: [r386]