bug fix in roslaunch
Merge branch 'ces_software' of https://github.com/robotics-in-concert/rocon_demos into ces_software