Merge branch 'master' of https://github.com/Itseez/opencv into back_proj_fix
authormlyashko <maria.lyashko@itseez.com>
Tue, 25 Mar 2014 10:52:39 +0000 (14:52 +0400)
committermlyashko <maria.lyashko@itseez.com>
Tue, 25 Mar 2014 10:52:39 +0000 (14:52 +0400)

Trivial merge