Merge the latest modification from trunk to rc7. Severity: ignore
Authored by: cdobre 2011-09-01
Parent: [r2305]
Child: [r2307]