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

Trivial merge