opencv2 2.4.6-1
Merge pull request #1410 from vrabaud/master

opencv2 2.4.6-1