Merging revisions -r12725:12749 from trunk into audio branch
Authored by: klaussfreire 2010-03-21
Parent: [r12749]
Child: [r12751]