Merge pull request #690 from berak:master
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 22 Mar 2013 15:35:17 +0000 (19:35 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 22 Mar 2013 15:35:17 +0000 (19:35 +0400)
commitec15d6f383e0aae4441153d69129003132afb184
tree8279003b8c40845b303f5ae06096d55191bc85f3
parent82d7292ee7d07197c4ea06de4bb5601fc6541f7a
parentd32af86e75e5391b815cf32f27a546a715a416a6
Merge pull request #690 from berak:master