Merge pull request #1899 from berak:b_3171_24
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 3 Dec 2013 07:32:30 +0000 (11:32 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 3 Dec 2013 07:32:31 +0000 (11:32 +0400)
commit3ff16200867d1c659efd17bb8bfee633366f7b05
tree147fdeb128fef20d40051ff5e0be82c1def56766
parent8db6d9f9b2d118b7710e15511dbcc1c93ef2bbf6
parent34a390fbc2b83638397066dbd89013da82f36003
Merge pull request #1899 from berak:b_3171_24