merge of 8982ebf16224df4ea5b5e7852e63112f004bbd33
authorJohn Bowler <jbowler@nslu2-linux.org>
Thu, 22 Sep 2005 20:48:29 +0000 (20:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 22 Sep 2005 20:48:29 +0000 (20:48 +0000)
commit3d93c6e8a04292859eef29ed4472be3b09a4fc11
tree18d2df3d2fe5aade8b9cf72218706fef879e859b
parenta2e5511b5d1eb3faffb47e92fa11136df715aaff
parent21f08b5dd116cce807fb5338dcde9d157c9ac045
merge of 8982ebf16224df4ea5b5e7852e63112f004bbd33
     and a89d5956fffe61c303ff6a056247b5569871e5c5