Merge branch 'master' of git://code.opencv.org/opencv
authoryao <bitwangyaoyao@gmail.com>
Thu, 6 Sep 2012 06:39:56 +0000 (14:39 +0800)
committeryao <bitwangyaoyao@gmail.com>
Thu, 6 Sep 2012 06:39:56 +0000 (14:39 +0800)

Trivial merge