opencv2 2.4.6

This is actually upstream 2.4.6.1