merge of 1f17c3b6458d62a2ad93a3e2025d6308394ee150
authorDerek Young <dyoung@nslu2-linux.org>
Tue, 30 Aug 2005 10:01:23 +0000 (10:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 Aug 2005 10:01:23 +0000 (10:01 +0000)
     and ecf0ce2fc59cf271ca00eb5fbcf693ff1d4e024a


Trivial merge