Merge branch 'master' of git://code.opencv.org/opencv
authoryao <bitwangyaoyao@gmail.com>
Wed, 8 Aug 2012 09:13:30 +0000 (17:13 +0800)
committeryao <bitwangyaoyao@gmail.com>
Wed, 8 Aug 2012 09:13:30 +0000 (17:13 +0800)

Trivial merge