Merge branch 'for-2.6.38/rc2-holder' into for-2.6.38/core