Initial message was : Merged recent changes from the trunk and add test for cxa_demangle to CMake build system.

[[Imported from SVN: r7355]]