Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl
authorMatthias Bady <aegirxx@gmail.com>
Mon, 13 Jan 2014 17:14:56 +0000 (18:14 +0100)
committerMatthias Bady <aegirxx@gmail.com>
Mon, 13 Jan 2014 17:14:56 +0000 (18:14 +0100)

Trivial merge