Null merge from 5.0

It is a backported patch.
This commit is contained in:
unknown 2011-01-15 13:51:41 +08:00
commit 3a6b404849

Diff content is not available