merge of 6e10609c36e07bf2bc3dc1f6840ff0cbb1fab3b5
authorMichael Lauer <mickey@vanille-media.de>
Sun, 24 Jul 2005 21:27:10 +0000 (21:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Jul 2005 21:27:10 +0000 (21:27 +0000)
     and cacdd0f9881c1cd93f95e5d3bef2a2db8dea2d3b


Trivial merge