Merge commit 'v2.6.37' into next
authorMichal Simek <monstr@monstr.eu>
Mon, 10 Jan 2011 08:29:29 +0000 (09:29 +0100)
committerMichal Simek <monstr@monstr.eu>
Mon, 10 Jan 2011 08:29:29 +0000 (09:29 +0100)

Trivial merge