Merge commit 'v2.6.30' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 11 Jun 2009 08:58:01 +0000 (01:58 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 11 Jun 2009 08:58:01 +0000 (01:58 -0700)

Trivial merge