merge pull request #60
clean up merge
update changelogs
1.2.1
Merge branch 'indigo-devel' of https://github.com/ros-perception/perception_pcl into indigo-devel

Conflicts:
	pcl_ros/pcl_nodelets.xml