merge of 558bb65faf7c2974476686b49c96141cd99dd145
authorDerek Young <dyoung@nslu2-linux.org>
Mon, 29 Aug 2005 22:01:10 +0000 (22:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 29 Aug 2005 22:01:10 +0000 (22:01 +0000)
     and 697cade2183f67dfff37e0d7896d63862e7c6b4e


Trivial merge