Merge commit 'v2.6.29' into x86/setup-lzma