merge of cb780a1cc92769b6b6b6112886a0e540248deb71
authorMatthias Hentges <oe@hentges.net>
Sun, 12 Feb 2006 20:58:54 +0000 (20:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 12 Feb 2006 20:58:54 +0000 (20:58 +0000)
     and ffe7fe8b0c34fd4dcf5ed98532d810e4164dd876


Trivial merge