Merge branch 'master' of git://code.opencv.org/opencv
authoryao <bitwangyaoyao@gmail.com>
Tue, 7 Aug 2012 00:37:38 +0000 (08:37 +0800)
committeryao <bitwangyaoyao@gmail.com>
Tue, 7 Aug 2012 00:37:38 +0000 (08:37 +0800)

Trivial merge