Merge branch 'master' of git://code.opencv.org/opencv
authorPhilipp Wagner <bytefish@gmx.de>
Thu, 9 Aug 2012 21:05:07 +0000 (23:05 +0200)
committerPhilipp Wagner <bytefish@gmx.de>
Thu, 9 Aug 2012 21:05:07 +0000 (23:05 +0200)

Trivial merge