Merge pull request #1257 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 16 Aug 2013 14:42:17 +0000 (18:42 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 16 Aug 2013 14:42:18 +0000 (18:42 +0400)
commit2349f7ea89f77579c22cb1e6fddecf054e5f2061
tree30d1e95d2be1bea291ef2d87727fd4f455668ada
parent556028eff500192f2d81d11d90b394b1003ddfe4
parent2530b580a83e72f384ea7782217305d260203fbe
Merge pull request #1257 from SpecLad:merge-2.4