Automatic merge of /spare/repo/linux-2.6/.git branch HEAD