merge of 2b0c75329e8e9e0257dd626d3af2ed2042ff24a4
authorMichael Lauer <mickey@vanille-media.de>
Mon, 4 Jul 2005 13:25:56 +0000 (13:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 4 Jul 2005 13:25:56 +0000 (13:25 +0000)
commit72b54d4c82eceb6f2145a651a1ba945c6345c3e0
tree9d1f860cedfe1ac2a29717164d0b6a99c76cc6c5
parent500aa56cea8f2d6de65cae1a2e92d1e45a57afc5
parent467caf022d294340d72a6825555f09ff4eb1b27d
merge of 2b0c75329e8e9e0257dd626d3af2ed2042ff24a4
     and 4f22ecbf9b052611a52b5e12802a2d8a9584cea7