merge of aa18ee8eb2023a276ade17e86029f95c7bd44e9b
authorMichael Lauer <mickey@vanille-media.de>
Thu, 29 Jun 2006 15:48:20 +0000 (15:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Jun 2006 15:48:20 +0000 (15:48 +0000)
commit06a933e4b57759fe9924a4a66aedbb71e9112d1d
treeabdc6a6f7251242fe7f9a85b036ee6dbbe831ea6
parent5cead5b4bb70dd970e2c6eae61f2d8e900c8f3dd
parent62db438fe44ef40a780bb6915faf902c84055817
merge of aa18ee8eb2023a276ade17e86029f95c7bd44e9b
     and c7ec779da9615eb36704166a03857d716d9a2908