Merge https://github.com/urikz/opencv
authorVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Wed, 5 Sep 2012 12:01:59 +0000 (16:01 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Wed, 5 Sep 2012 12:01:59 +0000 (16:01 +0400)
commitdcdbc638af3fcf425c30032b394444bebce13863
treecf55089eecc94998a976623210ef1767d9a41835
parentbcd0aefbca846b4c59be4e12eee37211cba526a3
parent66ce62cd0dc66f0d86580ecd7d20bfb7a990a86d
Merge https://github.com/urikz/opencv