Merge branch 'master' of https://github.com/Itseez/opencv
authorDaniel Fernandes <daniel@danielfernand.es>
Wed, 21 May 2014 22:59:10 +0000 (17:59 -0500)
committerDaniel Fernandes <daniel@danielfernand.es>
Wed, 21 May 2014 22:59:10 +0000 (17:59 -0500)

Trivial merge