Merge pull request #2110 from hmax:master
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 23 Jan 2014 10:37:33 +0000 (14:37 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 23 Jan 2014 10:37:34 +0000 (14:37 +0400)
commitee88cc2c5216f780cca0dc48a71f9d06a5c79372
treec81fdecbf795ffbf1c734b39e6ab509923d29526
parentba77719914d3889d0f60043628b9f0989c1d366b
parentd8e5f1611b338290cc73b8c20a3076599d688fbd
Merge pull request #2110 from hmax:master