Merge pull request #126 from vpisarev:bug_fixes3
authormarina.kolpakova <marina.kolpakova@itseez.com>
Thu, 1 Nov 2012 14:31:23 +0000 (18:31 +0400)
committermarina.kolpakova <marina.kolpakova@itseez.com>
Thu, 1 Nov 2012 15:01:27 +0000 (19:01 +0400)

Trivial merge