Automatic merge of /home/torvalds/junkio/.git/