merge of afb8a8c72b9f95f42b8ac9092aca5417404b46b7
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Oct 2005 09:06:59 +0000 (09:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Oct 2005 09:06:59 +0000 (09:06 +0000)
commit4c9535c1c193f75cb73f4f09182ae49172f3d889
treeaf6850107f803b789ca2f1e5e1f7443bb1873593
parent533a1d2161ce63780901cffc9e9edf0c072f571a
parent5ced936a9e54c2873ea9285c1cebde6d4ebbee9d
merge of afb8a8c72b9f95f42b8ac9092aca5417404b46b7
     and e6a4f3e9ea007d2b58e5b311715b7de8eff61b8d