merge of adbb0fa00fc14211e7902e17eb9ca516f0d13f44
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Apr 2006 11:45:19 +0000 (11:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 11:45:19 +0000 (11:45 +0000)
     and d21402039fbf5e29301a8367351ee97cf94887bf


Trivial merge