merge of '59cc00aa5181acfcee64ce8cec61034622bd74a4'
authorDerek Young <dyoung@nslu2-linux.org>
Fri, 29 Feb 2008 05:24:59 +0000 (05:24 +0000)
committerDerek Young <dyoung@nslu2-linux.org>
Fri, 29 Feb 2008 05:24:59 +0000 (05:24 +0000)
     and 'd11d5824c76b0b1aa853d8c90b90b0eeaa632eeb'


Trivial merge