Merging changes from trunk into audio branch
Authored by: klaussfreire 2010-07-21
Parent: [r12796]
Child: [r12798]