Merge commit 'v3.3-rc6' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 9 Mar 2012 18:55:17 +0000 (10:55 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 9 Mar 2012 18:55:17 +0000 (10:55 -0800)

Trivial merge