Rebasing mlab tree to mainline 2.6.22 branch