merge of 94b564900cca12eafeb635e5e42858918f06d86a
authorMichael Lauer <mickey@vanille-media.de>
Fri, 7 Apr 2006 17:22:40 +0000 (17:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Apr 2006 17:22:40 +0000 (17:22 +0000)
commit86485185e09b69eabebc98367ae6ff07ed553913
treecc0a17c681881a469350c1687da9ab0a44ce6137
parentddf840bda3e98eff84c09083edf2706c65ec683f
parentdc4bd49e4b6e63ae60f9315cd262618a07fbc1f5
merge of 94b564900cca12eafeb635e5e42858918f06d86a
     and c0c009a85be5cd4c4c3057c6ce86f866920ca8b9