ros-industrial/industrial_core — pull request #47 by shaun-edwards (2013-12-26 19:33:10+00:00)
Title: Merged changes from groovy-devel into hydro-devel.

@gavanderhoorn, please review. I had to manually fix a merge issue in simple_socket.h, but otherwise merge was automatic. Tests complete without any issues.