Merge commit 'v2.6.34-rc1' into for-2.6.35-incoming
authorJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 9 Mar 2010 22:22:08 +0000 (17:22 -0500)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 9 Mar 2010 22:22:08 +0000 (17:22 -0500)

Trivial merge