merge of 18e144de98e3237b76b0a43e32f7d732dbaf29ae
authorDerek Young <dyoung@nslu2-linux.org>
Thu, 8 Sep 2005 12:15:46 +0000 (12:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Sep 2005 12:15:46 +0000 (12:15 +0000)
     and 720e5c152e58498fce88b9b5ca79a6b34544f057


Trivial merge