Merge branch 'master' of git://code.opencv.org/opencv
authornoob <noob@noob.(none)>
Wed, 29 Aug 2012 16:14:07 +0000 (18:14 +0200)
committernoob <noob@noob.(none)>
Wed, 29 Aug 2012 16:14:07 +0000 (18:14 +0200)

Trivial merge