Merge branch 'master' into for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 10 Aug 2009 21:40:50 +0000 (23:40 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Mon, 10 Aug 2009 21:40:50 +0000 (23:40 +0200)

Trivial merge