Merge branch 'for-2.6.39' into for-2.6.40
Mark Brown [Tue, 26 Apr 2011 10:46:47 +0000 (11:46 +0100)]

Trivial merge