* cc_branch: merged with trunk (trunk to cc_branch)
Authored by: mortenmacfly 2010-09-18
Parent: [r6604]
Child: [r6606]