merge of 25e31bea2d2b004a18c1cd7472201bf31309d94c
authorMichael Lauer <mickey@vanille-media.de>
Sun, 17 Jul 2005 21:48:58 +0000 (21:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 17 Jul 2005 21:48:58 +0000 (21:48 +0000)
commit330714022514d2b913a2e5ced962598d2a02d2a4
tree945a6310923e5d3ec98f6c09e8b446e0fd8e2b87
parent2055533c6c6bb9660eba20d56f56616191cbd4c1
parent829db8137bd0e83a8aac4599eb7edc6c0f2fa445
merge of 25e31bea2d2b004a18c1cd7472201bf31309d94c
     and 301d170c61be8d8a8e702068717e29a57ef2e4c8