* cc_branch: merged with trunk (trunk to cc_branch)
Authored by: mortenmacfly 2010-10-11
Parent: [r6695]
Child: [r6697]