merge of bdb97a8488d4ea90ddba854e2c02a206b747fd3f
authorMatthias Hentges <oe@hentges.net>
Fri, 22 Jul 2005 18:25:52 +0000 (18:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jul 2005 18:25:52 +0000 (18:25 +0000)
     and c01db26784f543ae5912fe2d58bb400f3e8d3f86


Trivial merge