Merge pull request #94 from vpisarev/test_fixes
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 24 Oct 2012 10:42:20 +0000 (14:42 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 24 Oct 2012 10:42:20 +0000 (14:42 +0400)

Trivial merge