merge of 00bebbd1cd84aec5dd39771b35230a3b6d116036
authorMatthias Hentges <oe@hentges.net>
Sun, 7 Aug 2005 11:43:37 +0000 (11:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Aug 2005 11:43:37 +0000 (11:43 +0000)
     and 12a71a2edbf410daf807b4525179f0414f851939


Trivial merge