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

Trivial merge