ccef2b
author Dmitry Torokhov <dmitry.torokhov@gmail.com> 1267430120 -0800
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> 1267430120 -0800

Merge branch 'next' into for-linus
y›aú›.x