Merge pull request #1653 from jlblancoc:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 22 Oct 2013 09:53:11 +0000 (13:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 22 Oct 2013 09:53:12 +0000 (13:53 +0400)
commit6640846e9527310788784a0e24f84f81fba17f37
treed5e608c83b8e2be0678f44b96397800d9253d76e
parent1e556e08dc258496dfd5f6e49ba7c58391debb27
parent80e667b647615ef865e551c30effe46f03ff27f4
Merge pull request #1653 from jlblancoc:master