openrtm_aist: 1.1.0-20 in 'indigo/distribution.yaml' [bloom]
Merge branch 'master' of http://github.com/ros/rosdistro into bloom-openrtm_aist-1

Conflicts:
	indigo/distribution.yaml
Merge pull request #6017 from k-okada/bloom-openrtm_aist-1

openrtm_aist: 1.1.0-20 in 'indigo/distribution.yaml' [bloom]
jsk_common: 1.0.51-0 in 'hydro/distribution.yaml' [bloom]
openrtm_aist: 1.1.0-21 in 'indigo/distribution.yaml' [bloom]
Merge pull request #6020 from k-okada/bloom-openrtm_aist-0

openrtm_aist: 1.1.0-21 in 'indigo/distribution.yaml' [bloom]
openrtm_aist: 1.1.0-22 in 'indigo/distribution.yaml' [bloom]
Merge pull request #6021 from k-okada/bloom-openrtm_aist-1

openrtm_aist: 1.1.0-22 in 'indigo/distribution.yaml' [bloom]
pr2_plugs: 1.0.16-0 in 'hydro/distribution.yaml' [bloom]
pr2_apps: 0.5.11-0 in 'hydro/distribution.yaml' [bloom]
Merge pull request #6019 from k-okada/bloom-jsk_common-1

jsk_common: 1.0.51-0 in 'hydro/distribution.yaml' [bloom]
Merge pull request #6023 from TheDash/bloom-pr2_apps-3

pr2_apps: 0.5.11-0 in 'hydro/distribution.yaml' [bloom]
add debian defs for indigo deps
Merge pull request #6022 from TheDash/bloom-pr2_plugs-5

pr2_plugs: 1.0.16-0 in 'hydro/distribution.yaml' [bloom]
Merge pull request #6024 from adwilson10/master

add debian defs for indigo deps
pr2_plugs: 1.0.17-0 in 'hydro/distribution.yaml' [bloom]
Merge pull request #6026 from TheDash/bloom-pr2_plugs-6

pr2_plugs: 1.0.17-0 in 'hydro/distribution.yaml' [bloom]
automatic merge triggered by jenkins to include upstream (ros/rosdistro) updates