Merge commit 'v2.6.39' into 20110526