merge 2.6.30 patches