merge of 37fc56a61784036cba34459336e8498d980243a2
authorMatthias Hentges <oe@hentges.net>
Sun, 16 Apr 2006 12:46:39 +0000 (12:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Apr 2006 12:46:39 +0000 (12:46 +0000)
commit8aa1414fb7263f2f451e65119175db80960441b0
tree7460b5341ebcfe71e37dabc3e550c3d50a26aa1b
parent2ce3865c1233f7e9b813096276e7d6f6d8694898
parenta55ff33a61a855119b2153e4efd0bb70848d4c56
merge of 37fc56a61784036cba34459336e8498d980243a2
     and 80830d28dad51d1eb0b440e79ba54aab338b13db