Merge branch 'norm_Matx' of git://github.com/vrabaud/opencv
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 23 Aug 2012 20:38:10 +0000 (00:38 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 23 Aug 2012 20:38:10 +0000 (00:38 +0400)

Trivial merge