Merge branch 'master' into for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 9 Sep 2009 22:02:02 +0000 (00:02 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 9 Sep 2009 22:02:02 +0000 (00:02 +0200)

Trivial merge