merge of 68c930a87450b83ee412109725aa2845c4653e11
authorMichael Lauer <mickey@vanille-media.de>
Thu, 29 Sep 2005 12:12:05 +0000 (12:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Sep 2005 12:12:05 +0000 (12:12 +0000)
commit15321fab4d27421977520ba783367a6ab5572207
treec6c0e82bbf112d181fc57a7e4b93056427af4dcb
parent18239318c7ed794f9b2959be8a9702569468cc31
parentfa83931aaa6c899c2400e3f47a3b693bb16f5fd8
merge of 68c930a87450b83ee412109725aa2845c4653e11
     and 6b859f9dad018680c0cb717f227911f81f1ba1c8