Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 17 Oct 2012 12:18:08 +0000 (16:18 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 17 Oct 2012 12:18:08 +0000 (16:18 +0400)

Trivial merge