Merge remote-tracking branch 'origin/libphidgets-2.1.8.20130618' into libpcan-7.9
Merge branch 'hydro_dev' of github.com:ipa-nhg/cob_extern into hydro_dev