Merge pull request #143 from vpisarev/bug_fixes4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 13 Nov 2012 14:17:33 +0000 (18:17 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 13 Nov 2012 14:17:33 +0000 (18:17 +0400)

Trivial merge