merge of '361c2ba55f181bc00df146d6f126a924c909d192'
authorDerek Young <dyoung@nslu2-linux.org>
Thu, 28 Feb 2008 12:33:46 +0000 (12:33 +0000)
committerDerek Young <dyoung@nslu2-linux.org>
Thu, 28 Feb 2008 12:33:46 +0000 (12:33 +0000)
     and '9366ce8253adcd62db561e69be7a3f70ed7ba587'


Trivial merge