Merge branch 'from-tomtucker' into for-2.6.26
authorJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 20 May 2008 23:57:38 +0000 (19:57 -0400)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 20 May 2008 23:57:38 +0000 (19:57 -0400)

Trivial merge