Merge branch '2.4_fixFft' of https://github.com/bitwangyaoyao/opencv into 2.4
authoryao <bitwangyaoyao@gmail.com>
Tue, 26 Feb 2013 12:30:42 +0000 (20:30 +0800)
committeryao <bitwangyaoyao@gmail.com>
Tue, 26 Feb 2013 12:30:42 +0000 (20:30 +0800)

Trivial merge