merge of 3fe026a130277946b2552c28c3fdda5e9bd74b31
authorMichael Lauer <mickey@vanille-media.de>
Mon, 22 May 2006 11:00:18 +0000 (11:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 May 2006 11:00:18 +0000 (11:00 +0000)
commit087e914265f66c12ecbb64c8132e6e7237d4a3d8
treef9bafa33395e258d1a1c95a65b864fdbaa9978ca
parent6eb6bc96c12ad92135f05d422e98f52f058b4aab
parent7687adb5bc94bae64af71f8022254b132acc9543
merge of 3fe026a130277946b2552c28c3fdda5e9bd74b31
     and d295f271af118b6b44395ca3e2c23eba55f3fa69