Merge pull request #4686 from vrabaud/master

OpenCV 2.4.9
patch OpenCV for groovy/Oneiric