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)

Trivial merge