merge of 94191cc6b29453ad677a49c629a88b38120a4a5b
authorMatthias Hentges <oe@hentges.net>
Fri, 19 May 2006 09:49:12 +0000 (09:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 May 2006 09:49:12 +0000 (09:49 +0000)
     and d5f1262d9263a58e4024f5dde8816ef2f06baddc


Trivial merge