merge of c05500f989033c95b9140a0af0e80c12779ee62d
authorMatthias Hentges <oe@hentges.net>
Tue, 21 Feb 2006 12:23:39 +0000 (12:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 21 Feb 2006 12:23:39 +0000 (12:23 +0000)
     and d46341ca553d7906dd18e7869e24f37f7e7c1590


Trivial merge