Merge branch 'master' of https://github.com/edgarriba/opencv
authoredgarriba <edgar.riba@gmail.com>
Mon, 18 Aug 2014 19:46:23 +0000 (21:46 +0200)
committeredgarriba <edgar.riba@gmail.com>
Mon, 18 Aug 2014 19:46:23 +0000 (21:46 +0200)

Trivial merge