remove c++0x
Merge branch 'release_electric'
release 0.4.7
Merge branch 'release_electric'
fix compile issue on natty