Merge commit 'v3.2-rc3' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 29 Nov 2011 09:51:07 +0000 (01:51 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 29 Nov 2011 09:51:07 +0000 (01:51 -0800)

Trivial merge