Merge branch 'master' into for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 29 Jul 2009 18:28:08 +0000 (20:28 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 29 Jul 2009 18:28:08 +0000 (20:28 +0200)

Trivial merge