merge of e9dd020fc3fd113d6a079b11a238249de03ff731
authorMichael Lauer <mickey@vanille-media.de>
Mon, 8 Aug 2005 15:16:40 +0000 (15:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Aug 2005 15:16:40 +0000 (15:16 +0000)
commit9707ef90ba9f1bdb4d9292bf4c241bf0c9716217
tree837ff056fa4593706c11c85fcecb646b6ad6412d
parentac2189551d8f54baafe3e5526bd38433f8f9cf8a
parent0a873fcb06c64d24f12ed36de6e77d0d94ff3201
merge of e9dd020fc3fd113d6a079b11a238249de03ff731
     and f9d3b94ab86532d41ac3eded503c6e47d6d8de4c