Merging integration_0_4 r210 into trunk.
Authored by: mikhail_beris 2009-12-04
Parent: [r210]
Child: [r212]