Merge audio branch data changes into trunk
(see previous logs for details)
Authored by: klaussfreire 2010-08-01
Parent: [r12814]
Child: [r12816]