merge of 394aa1ee96c4574cc5cb238593d0bb72ed8674e6
authorDerek Young <dyoung@nslu2-linux.org>
Thu, 8 Sep 2005 23:15:58 +0000 (23:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Sep 2005 23:15:58 +0000 (23:15 +0000)
     and 3d296e3ebdf47d22e6d6437432ebacacb85fec05


Trivial merge