Merge branch 'master' of git://code.opencv.org/opencv
authorAlexander Mordvintsev <zzznah@gmail.com>
Mon, 17 Sep 2012 15:37:38 +0000 (19:37 +0400)
committerAlexander Mordvintsev <zzznah@gmail.com>
Mon, 17 Sep 2012 15:37:38 +0000 (19:37 +0400)

Trivial merge