Merge branch 'master' of git://code.opencv.org/opencv
authorPhilipp Wagner <bytefish@gmx.de>
Fri, 7 Sep 2012 20:44:15 +0000 (22:44 +0200)
committerPhilipp Wagner <bytefish@gmx.de>
Fri, 7 Sep 2012 20:44:15 +0000 (22:44 +0200)

Trivial merge