Merge branch 'master' of git://5.9.49.245/opencv
authormarina.kolpakova <marina.kolpakova@itseez.com>
Wed, 25 Jul 2012 04:33:51 +0000 (08:33 +0400)
committermarina.kolpakova <marina.kolpakova@itseez.com>
Wed, 25 Jul 2012 04:33:51 +0000 (08:33 +0400)

Trivial merge