snapshot from rosman
snapshot from rosman
Merge branch 'hydro-devel' of https://github.com/chuck-h/rosserial into hydro-devel

Conflicts:
	rosserial_psoc4/msg/Nh_diag.msg
	rosserial_psoc4/src/ros_lib/examples/pubsub_test/pubsub_test.cpp
	rosserial_server/CMakeLists.txt
	rosserial_server/launch/socket.launch
	rosserial_server/package.xml
	rosserial_server/src/AsyncReadBuffer.h
	rosserial_server/src/serial_node.cpp
beginning of rosserial_avr (non-arduino avr)
cast data types for some debug message conversions
restore brace lost in merge resolve