Merge branch 'master' of git://code.opencv.org/opencv
authorAlexander Kapustin <alexander.kapustin@itseez.com>
Thu, 20 Sep 2012 13:32:54 +0000 (17:32 +0400)
committerAlexander Kapustin <alexander.kapustin@itseez.com>
Thu, 20 Sep 2012 13:32:54 +0000 (17:32 +0400)

Trivial merge