merge of 5d00faa43da50d29b85f6526e4e7910ddc4c2894
authorMatthias Hentges <oe@hentges.net>
Thu, 23 Feb 2006 12:34:37 +0000 (12:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 23 Feb 2006 12:34:37 +0000 (12:34 +0000)
     and 5dc03a4f61ff65b8e7255e287dd9ead584c6c81f


Trivial merge