Fix compilation issue with C++0x on Ubuntu build system.
Merge branch 'c++11'.