Merge remote-tracking branch 'upstream/2.4' into 2.4
authorpeng xiao <hisenxpress@gmail.com>
Thu, 14 Mar 2013 01:24:45 +0000 (09:24 +0800)
committerpeng xiao <hisenxpress@gmail.com>
Thu, 14 Mar 2013 01:24:45 +0000 (09:24 +0800)

Trivial merge