Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6