Merge branch 'from-tomtucker' into for-2.6.28
J. Bruce Fields [Wed, 8 Oct 2008 22:22:18 +0000 (18:22 -0400)]

Trivial merge