Merge pull request #76 vpisarev/test_fixes_1
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 22 Oct 2012 17:08:47 +0000 (21:08 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 22 Oct 2012 17:13:26 +0000 (21:13 +0400)

Trivial merge