Merge origin/master into cuda-dev
authormarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 26 Nov 2012 14:54:29 +0000 (18:54 +0400)
committermarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 26 Nov 2012 14:56:33 +0000 (18:56 +0400)
commit1712d0930c1bda04df84f81563f196e8fd138ac5
treee9242b96f23859a45fa0cfbf4dd1d893fb87a33b
parentafff9cf71634a96a491fdc7d195e267ba126871e
parent5c2d59066fac7aba1dfea88d58cd0baa7b4c6e71
Merge origin/master into cuda-dev