merge of 2269487af65346b42e5e83ac451ab4bfeb12185b
authorMatthias Hentges <oe@hentges.net>
Wed, 10 Aug 2005 16:31:32 +0000 (16:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 10 Aug 2005 16:31:32 +0000 (16:31 +0000)
     and 802b5c32960cd36a01f851dc081ca5c7b123dec5


Trivial merge