Merge branch 'master' of https://github.com/f-morozov/opencv
authorAlexander Shishkov <alexander.shishkov@itseez.com>
Thu, 18 Jul 2013 21:08:49 +0000 (01:08 +0400)
committerAlexander Shishkov <alexander.shishkov@itseez.com>
Thu, 18 Jul 2013 21:08:49 +0000 (01:08 +0400)

Trivial merge