Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 22 Oct 2012 12:57:56 +0000 (16:57 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 22 Oct 2012 12:57:56 +0000 (16:57 +0400)

Trivial merge