Merge branch 'master', remote-tracking branch 'upstream/master'
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)
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
argparse/support are part of core Python in Fedora
Updated core python tools to use PIP

We can't use the Fedora RPMs until the packages that are dependant on those packages are in RPM form as well. If they are mixed (some are only available in PIP right now), there are version conflicts that cause the depending packages to fail.