Merge commit 'v2.6.32' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 3 Dec 2009 07:38:13 +0000 (23:38 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 3 Dec 2009 07:38:13 +0000 (23:38 -0800)

Trivial merge