merge of 14a3a586432535e6376b5584e8ab20d9c371d7f5
authorDerek Young <dyoung@nslu2-linux.org>
Thu, 8 Sep 2005 20:16:16 +0000 (20:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Sep 2005 20:16:16 +0000 (20:16 +0000)
     and b8529852029b73c10de97a36287237e15e96e808


Trivial merge