Merge pull request #1496 from shawke:patch-1
authorAlexander Smorkalov <alexander.smorkalov@itseez.com>
Wed, 25 Sep 2013 07:29:46 +0000 (11:29 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 25 Sep 2013 07:29:46 +0000 (11:29 +0400)
commite1f55c3fcc4a69928c2135cc6f8087a01682744e
treefc04c92deed1fd3ab614c2bd2c513a9732f469d2
parentc8b97271cc27849b33372709fd8908ac388d17b3
parent720241de87a52e7c96e15d53f4dcc21650a276c5
Merge pull request #1496 from shawke:patch-1