Merge branch from CUDA team
authormarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 24 Dec 2012 11:08:33 +0000 (15:08 +0400)
committermarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 24 Dec 2012 11:08:46 +0000 (15:08 +0400)

Trivial merge