Merge with rsync://fileserver/linux

Update to 2.6.12-rc3