Merge branch 'master' of git://code.opencv.org/opencv
authorMarius Muja <mariusm@cs.ubc.ca>
Fri, 28 Sep 2012 17:40:51 +0000 (10:40 -0700)
committerMarius Muja <mariusm@cs.ubc.ca>
Fri, 28 Sep 2012 17:40:51 +0000 (10:40 -0700)

Trivial merge