opencv2 2.4.6-1 Groovy and 2.4.6-3 Hydro
Merge pull request #2411 from vrabaud/master

opencv2 2.4.6-1 Groovy and 2.4.6-3 Hydro