Merge branch 'master' into for-linus
Rafael J. Wysocki [Mon, 14 Sep 2009 18:26:05 +0000 (20:26 +0200)]

Trivial merge