Merged into 2.6.13-rc1.