Merge pull request #1155 from bitwangyaoyao:master_fix
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Sun, 21 Jul 2013 14:50:38 +0000 (18:50 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sun, 21 Jul 2013 14:50:39 +0000 (18:50 +0400)

Trivial merge