Merge commit 'v3.4-rc4' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 22 Apr 2012 06:28:35 +0000 (23:28 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 22 Apr 2012 06:28:35 +0000 (23:28 -0700)

Trivial merge