merge of 4bea65581a76f2d570ab41485732af8db23f2559
authorMichael Lauer <mickey@vanille-media.de>
Mon, 22 May 2006 21:42:06 +0000 (21:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 May 2006 21:42:06 +0000 (21:42 +0000)
commit2bdd31c44c61561d5ffff2c4f469ffe05a53ef02
tree6ac2dc512b9372d07b498de1f9816933c1d11e50
parentea71c90a045945a0a4d3904cc0e6896a1f9a1d41
parent5925930282000b3be0e12560262ba37fcce8e9cd
merge of 4bea65581a76f2d570ab41485732af8db23f2559
     and 958f273429afa22714e97b2c35ad0a3cd94dc248