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

Trivial merge