Merge branch 2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 10 Dec 2012 19:51:14 +0000 (23:51 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 10 Dec 2012 19:51:34 +0000 (23:51 +0400)
commit67ce03d7dd7d2efd53c57fc6fb4c12b4509fe2dc
tree9fdb7afbc6264115a3f6c2fd23d0a9dbe88bcb66
parent49e038c724a2eea32ba3754e00a3a5a7f9a740fb
parent60ad505a63032df8816d981adfd332669476aec8
Merge branch 2.4