Merge pull request #4 from Itseez/2.4
authorkdrobnyh <klim.drobnyh@gmail.com>
Sat, 17 Aug 2013 16:24:43 +0000 (09:24 -0700)
committerkdrobnyh <klim.drobnyh@gmail.com>
Sat, 17 Aug 2013 16:24:43 +0000 (09:24 -0700)
OpenCV changes


Trivial merge