Fix CMakeLists.txt to work for ubuntu 13.04
Merge branch 'master' into ubuntu_13.04
Merge branch 'master' into ubuntu_13.04
Merge branch 'ubuntu_13.04'