Merge pull request #2262 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 3 Feb 2014 11:33:40 +0000 (15:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 3 Feb 2014 11:33:41 +0000 (15:33 +0400)
commit652a0bd5ce90b2237b0e0495bb46e9a94701d52a
tree2cb60ef0bbbf45a167c56150552a7c8b4f402e61
parent0fef7f8b963c4006d04200549152bccdbdf40c3f
parent2bbda9d225028c8462f926b600774e5b07fee264
Merge pull request #2262 from SpecLad:merge-2.4