Fix catkin workspace for recursive packages
merging
Merge pull request #3 from galou/master

Fix catkin workspace for recursive packages