Merge pull request #2390 from nicolasmartin3d:master_bug3546
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 10 Apr 2014 09:33:42 +0000 (13:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 10 Apr 2014 09:33:43 +0000 (13:33 +0400)
commit604a64b2060f1f53f68764ca89b6c468d746ab5c
tree0754870067ce9496a68dfeb831f580ba42be49c8
parenta0bf7f82ba429cf9e1daa5173118cc6de41e876e
parent67cf0dabea6dd07c495ad9141653a333e48378b5
Merge pull request #2390 from nicolasmartin3d:master_bug3546