(catkin.cmake, CMakeLists.txt) : Update hrp2w's conf setting
Merge remote-tracking branch 'origin/master' into update_conf_setting_for_hrp2w
Merge remote-tracking branch 'origin/master' into update_conf_setting_for_hrp2w
Merge pull request #87 from snozawa/update_conf_setting_for_hrp2w

Merged