Merge pull request #247 from wswld:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 24 Dec 2012 17:02:04 +0000 (21:02 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 24 Dec 2012 17:02:04 +0000 (21:02 +0400)
commit6bc795308e60428803d4df01fdd4bdce3cea0155
treeeee0bc775ce86d3a6eb8ce8bf1303e682154d582
parent02d1e68c6472836adfa4713da04bfc0d8983f590
parent1e5b533d017bc2549febc5338a049499112f182f
Merge pull request #247 from wswld:2.4