merge of 35b40bf4117bf5bebe985df8f8d329cddaccfbbb
authorMichael Lauer <mickey@vanille-media.de>
Wed, 26 Apr 2006 16:32:10 +0000 (16:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Apr 2006 16:32:10 +0000 (16:32 +0000)
commitba5b609e80f36ebe09a122bfbdc6d0bf475d181f
tree7c92a6f2a111c9ed0c808abf5e84a58ff01f8629
parent5d9c49fc6731eb56d23b23ede2824cd7512e4c4f
parent2e0dce9c5ff7d78192fc993e30e7fefdbda30311
merge of 35b40bf4117bf5bebe985df8f8d329cddaccfbbb
     and 85b50b96aeb7153c7b2bfcb474d8cde63a470737