Merge pull request #104 from AoD314:master
authormarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 29 Oct 2012 11:12:28 +0000 (15:12 +0400)
committermarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 29 Oct 2012 11:12:52 +0000 (15:12 +0400)

Trivial merge