merge of 8fb156c1063985412f3d3d473d7c4641b7c1ce8c
authorMatthias Hentges <oe@hentges.net>
Thu, 25 May 2006 11:59:26 +0000 (11:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 May 2006 11:59:26 +0000 (11:59 +0000)
commit62be5a5ffe0f30551c1e92edf56ddccc4056e421
tree21af0111e29a63ab61cc56202418e4c805dd32f6
parentf0b2f4dbe65e29fe5d2acabdfdb3478271939823
parent13af56a1eff8f8f97f80ff34012f54d104cf7a9a
merge of 8fb156c1063985412f3d3d473d7c4641b7c1ce8c
     and b04511549df1568005f531875b06fcbdfb7ee3c2