Merge pull request #2556 from DeanF:master
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 3 Apr 2014 13:07:06 +0000 (17:07 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 3 Apr 2014 13:07:06 +0000 (17:07 +0400)
commit9a3895d842d2afcd2a97adb858394185df6427bf
tree93d202b71bb91b1fc93beac9accbfab7dad18ed0
parent2aab7b2926e8317c931862354a07ac2a6e060413
parent48df67a9c5e117d306c2598a52524238e9075fc0
Merge pull request #2556 from DeanF:master