merge of 1fe10948f69f463338bd48b84e81bdd4240afc55
authorDerek Young <dyoung@nslu2-linux.org>
Thu, 8 Sep 2005 14:16:07 +0000 (14:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Sep 2005 14:16:07 +0000 (14:16 +0000)
     and 67d2c7e1bf087c7c007705c24cae5ff93bd007be


Trivial merge