Merge branch 'master' of git://code.opencv.org/opencv
authorPhilipp Wagner <bytefish@gmx.de>
Sun, 29 Jul 2012 20:20:48 +0000 (22:20 +0200)
committerPhilipp Wagner <bytefish@gmx.de>
Sun, 29 Jul 2012 20:20:48 +0000 (22:20 +0200)

Trivial merge