Merge pull request #330 from sromberg:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 24 Jan 2013 10:26:54 +0000 (14:26 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 24 Jan 2013 10:26:54 +0000 (14:26 +0400)
commitcc399e2ade94d2d527ea7a3468a1770305eb1b09
tree3e51980dc797e63618e84a29997d75a72d245c1c
parent3c4cfccc88de2f9677fd27383dda4d2f757c6e19
parent9f417268b302a0b7fe67b87e2c5444e3379e2ddf
Merge pull request #330 from sromberg:2.4