Merge branch 'master' of git://code.opencv.org/opencv
authorAlexandre Benoit <benoit.alexandre.vision@gmail.com>
Fri, 31 Aug 2012 09:20:13 +0000 (11:20 +0200)
committerAlexandre Benoit <benoit.alexandre.vision@gmail.com>
Fri, 31 Aug 2012 09:20:13 +0000 (11:20 +0200)

Trivial merge