Merge branch 'master' of git://code.opencv.org/opencv
authorniko <newlife20080214@gmail.com>
Fri, 3 Aug 2012 06:09:04 +0000 (14:09 +0800)
committerniko <newlife20080214@gmail.com>
Fri, 3 Aug 2012 06:09:04 +0000 (14:09 +0800)

Trivial merge