Merge pull request #97 from asmorkalov/2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 24 Oct 2012 11:02:05 +0000 (15:02 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 24 Oct 2012 11:02:05 +0000 (15:02 +0400)

Trivial merge