merge of 06b2731011911f8d2073caedb7598acabaa73120
authorMatthias Hentges <oe@hentges.net>
Fri, 22 Jul 2005 16:14:22 +0000 (16:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jul 2005 16:14:22 +0000 (16:14 +0000)
     and f765c50cac950ddf20df126682907000ec6f7101


Trivial merge