Merge commit 'v2.6.30' into for-2.6.31
authorJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 16 Jun 2009 01:08:07 +0000 (18:08 -0700)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 16 Jun 2009 01:08:07 +0000 (18:08 -0700)

Trivial merge