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)
commit57fc5e00f3f36a878a4288c1e018364da4964ce7
tree71bbfa7c5106288fc95ef4e9de90d37c45e1e659
parent9a01532caa1be5d0bd17a04ded94faf0ede8cb9a
parent3d0c08816d3fc3f74c9b25f69eeaac41dca9160b
Merge pull request #126 from vpisarev:bug_fixes3