Merge https://github.com/Itseez/opencv into rho
authorOlexa Bilaniuk <obilaniu@gmail.com>
Sat, 22 Nov 2014 17:28:19 +0000 (12:28 -0500)
committerOlexa Bilaniuk <obilaniu@gmail.com>
Sat, 22 Nov 2014 17:28:19 +0000 (12:28 -0500)

Trivial merge