merge of 2af94f47b2ba34daf8f717acaf9c292ce1f42c61
authorMatthias Hentges <oe@hentges.net>
Mon, 8 Aug 2005 14:51:47 +0000 (14:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Aug 2005 14:51:47 +0000 (14:51 +0000)
     and 626a7a777e8de41589b88c0e6087c6a26d3739de


Trivial merge