OpenCV 2.4.6.1

Closes #337.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>