merge of 5e78a71a932c2cdd02e89b6e0cc1e4d360e34b76
authorMatthias Hentges <oe@hentges.net>
Sat, 11 Mar 2006 11:57:36 +0000 (11:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 11 Mar 2006 11:57:36 +0000 (11:57 +0000)
     and ba5e9634062d6920fa620e6423c391c6e9f4ce04


Trivial merge