Automatic merge of rsync://www.fr.zoreil.com/linux-2.6.git branch HEAD