merge of 236d70d96b3f9300bb6e751a5d3f3ea13f9a04db
authorMichael Lauer <mickey@vanille-media.de>
Fri, 23 Jun 2006 23:15:59 +0000 (23:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 Jun 2006 23:15:59 +0000 (23:15 +0000)
     and f4984d1bec6ce4b4b676ecf827227e24bfb4eab1


Trivial merge