Merge branch 'master' into for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 20 Aug 2009 18:24:33 +0000 (20:24 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Thu, 20 Aug 2009 18:24:33 +0000 (20:24 +0200)

Trivial merge