Merge pull request #364 from jonbinney/master

fixed typo in my last pull request
Update releases/groovy.yaml
bump ORK renderer and reconstruction
object_recognition_renderer 0.1.5
use the proper URL for sql_database
Added humanoid / Nao stack back for electric
Removed double octomap_mapping entry in doc, now in its own rosinstall
Merge pull request #365 from ahornung/master

alufr-ros-pkg fixes for doc (electric / fuerte)
Use ruby1.9.1-dev in quantal.

Ruby 1.9.x is the default and when installing ruby1.8-dev, one gets the error:

/usr/lib/ruby/1.9.1/rubygems/custom_require.rb:36:in 'require': cannot load such file -- mkmf (LoadError)
  	from /usr/lib/ruby/1.9.1/rubygems/custom_require.rb:36:in 'require'
  	from extconf.rb:1:in '<main>'
  rake aborted!

So the ruby1.8-dev files are not picked up and useless for our case.

Signed-off-by: Peter Soetens <peter@thesourceworks.com>
Update releases/groovy.yaml
sql_database 0.4.5
move pymongo and pyside to the python.yaml
reorder by alphabetical order
object_recognition_renderer 0.1.6
object_recognition_renderer 0.1.7
bum pobject_recognition_linemod and object_recognition_renderer:
object_recognition_linemod 0.2.9
Merge pull request #367 from psoetens/master

Please merge to fixup ruby build environment on quantal.
genmsg 0.4.17-0
common_msgs 1.9.14-0