Merge pull request #289 from jmbuena:master
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 16 Jan 2013 13:01:00 +0000 (17:01 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 16 Jan 2013 13:01:00 +0000 (17:01 +0400)
commit867ddebe07eaa06f7bef094206aafb3c7bfac8d4
treeffa0d76db08487f3a65af0aafe0e9c2704acb3c5
parentbb733321680ce5031872e87304ea0962a03d4124
parent28a7be69ea770808ecca078aa2a9baabcc596062
Merge pull request #289 from jmbuena:master