Merge pull request #110 from vpisarev/test_fixes2
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 31 Oct 2012 12:52:50 +0000 (16:52 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 31 Oct 2012 12:52:50 +0000 (16:52 +0400)

Trivial merge