Merge branch 'master' into for-linus
Rafael J. Wysocki [Wed, 9 Sep 2009 22:02:02 +0000 (00:02 +0200)]

Trivial merge