Merge branch '2.4' of git://github.com/Itseez/opencv into mog2_weight_bugfix
authorFirat Kalaycilar <fkalaycilar@gmail.com>
Tue, 18 Mar 2014 12:00:30 +0000 (14:00 +0200)
committerFirat Kalaycilar <fkalaycilar@gmail.com>
Tue, 18 Mar 2014 12:00:30 +0000 (14:00 +0200)

Trivial merge