Merging patches from Yinghai Lu (fb2_s4882_changes.diff.bz2):