merge of 1506d12fe8ff1d8436934663e78fc3c298406bd2
authorMatthias Hentges <oe@hentges.net>
Mon, 27 Mar 2006 16:37:49 +0000 (16:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 27 Mar 2006 16:37:49 +0000 (16:37 +0000)
     and 3910a6fc3b183fcafe7dfaa73ec6d03f9da5cb69


Trivial merge