Merged the trunk r8927, r8929
authorAndrey Kamaev <no@email>
Tue, 3 Jul 2012 11:52:54 +0000 (11:52 +0000)
committerAndrey Kamaev <no@email>
Tue, 3 Jul 2012 11:52:54 +0000 (11:52 +0000)
commitd386667478f4031c64d00f47faa032da7993b118
treedb007caaa1d9dabe61d397de602e532741726d89
parenta0ce328f98cdbd1518ca92cfb535e7c5c24af42a
Merged the trunk r8927, r8929
modules/features2d/src/descriptors.cpp
modules/imgproc/src/imgwarp.cpp