merge of 109f30daf7a26b1cac99e95bb47b44100b625bd7
authorDerek Young <dyoung@nslu2-linux.org>
Tue, 30 Aug 2005 16:01:18 +0000 (16:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 Aug 2005 16:01:18 +0000 (16:01 +0000)
     and ec7219dd8333a54ac4264075615291dc9b5db3ca


Trivial merge