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)
commit021e339c349f6a37357c942b2ad56c00ec4dfbb8
tree38965fbda156fb85620ab3c0729ab46a70c2f215
parentdded9843fdbecb2543960c1a1bb58d879f2d3701
parentf82d311edcd0d921e508404dbc1f100f8007ad91
merge of c05500f989033c95b9140a0af0e80c12779ee62d
     and d46341ca553d7906dd18e7869e24f37f7e7c1590