Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_pyrup_fix
authorpeng xiao <hisenxpress@gmail.com>
Wed, 15 May 2013 00:55:43 +0000 (08:55 +0800)
committerpeng xiao <hisenxpress@gmail.com>
Wed, 15 May 2013 00:55:43 +0000 (08:55 +0800)

Trivial merge