Merge branch 'master' of code.opencv.org:opencv
authoralexandre benoit <benoit.alexandre.vision@gmail.com>
Thu, 4 Jul 2013 14:19:24 +0000 (16:19 +0200)
committeralexandre benoit <benoit.alexandre.vision@gmail.com>
Thu, 4 Jul 2013 14:19:24 +0000 (16:19 +0200)

Trivial merge