merge of c0cfa6456fcf9d90a45c2a15139dcb2414db2c03
authorMichael Lauer <mickey@vanille-media.de>
Sat, 20 May 2006 18:24:39 +0000 (18:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 May 2006 18:24:39 +0000 (18:24 +0000)
commitf89ded6650e53252ce92bb12072a47f63badc918
treeb4b1fcfcab3b70071a51dd3327180cdd80f6529c
parentda3bae77627f05bcf96c316b340c05f51e5c6fc1
parentb203c31021eaecc7750b1e670472b97777f0511b
merge of c0cfa6456fcf9d90a45c2a15139dcb2414db2c03
     and f79576d9b9c2a65a2e9e5b3d7b7f1d4a57ea892a