merge of 7fa1e5c6dd75c098cabd0b1240a46de4c4a174ab
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Apr 2006 22:19:59 +0000 (22:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 22:19:59 +0000 (22:19 +0000)
commit1c91a636dfb9813b4c65c168bdef7dcc8fcaf768
tree726a107d72c7ea0368088ee24b2aafc3ef052a2d
parent64736d9a4d3ff35eeefb84fbb6bdb2999f84197c
parentf6d5785f33bcec280086c2e5fbd8bee727578f74
merge of 7fa1e5c6dd75c098cabd0b1240a46de4c4a174ab
     and ab41e679a9bfc6bc2294e34b63fd70a9ef105ead