Merge branch 'master'; commit 'v2.6.39-rc3' into next
James Morris [Tue, 19 Apr 2011 11:32:41 +0000 (21:32 +1000)]

Trivial merge