Merge commit 'v2.6.32-rc5' into for-2.6.33
authorJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 27 Oct 2009 22:45:17 +0000 (18:45 -0400)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 27 Oct 2009 22:45:17 +0000 (18:45 -0400)

Trivial merge