merge of b527e063b110f80270c8dc87e41ce53a83d4870a
authorMichael Lauer <mickey@vanille-media.de>
Thu, 20 Apr 2006 14:42:43 +0000 (14:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 20 Apr 2006 14:42:43 +0000 (14:42 +0000)
commitccd41a11e5dd1de18867049b30a76ad8137a97ef
tree221ff739e95e4b0db04bcf3f12f2c8cdeefa9d4c
parent79993864e19b58d80931e7d2154f905fa1b83040
parent1057dcb20b2c5b38d4604c15239862cfaad29f07
merge of b527e063b110f80270c8dc87e41ce53a83d4870a
     and c8b301a65a734bb6f775222ccee1d1e8e7372ba3