Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git/

This commit is contained in:
Linus Torvalds 2005-05-04 14:23:14 -07:00
commit 1d42a0ecf4