Merge branch 'master' into for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 30 Jul 2009 17:38:04 +0000 (19:38 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Thu, 30 Jul 2009 17:38:04 +0000 (19:38 +0200)

Trivial merge