Merge branch 'master' of git://code.opencv.org/opencv
authorbitwangyaoyao <bitwangyaoyao@gmail.com>
Mon, 24 Sep 2012 12:29:21 +0000 (20:29 +0800)
committerbitwangyaoyao <bitwangyaoyao@gmail.com>
Mon, 24 Sep 2012 12:29:21 +0000 (20:29 +0800)

Trivial merge