Merge pull request #1061 from bitwangyaoyao:2.4_fix2
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 1 Jul 2013 09:21:12 +0000 (13:21 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 1 Jul 2013 09:21:12 +0000 (13:21 +0400)
commitc8cd2cf6011f7a97a20462f80686f1685c5b5b13
tree3b251dc6ce6a0af22aad49ab5663b2b8dd31ccbb
parent087bab6cebb7ba71f5327e0fc7b10d7164e504aa
parentc66e27d49e8c40a98149e6c3a53075a18dfa6878
Merge pull request #1061 from bitwangyaoyao:2.4_fix2