merge of 7086df3f26c4f3f859bc974370b0550cc148fbdd
authorMichael Lauer <mickey@vanille-media.de>
Sat, 3 Jun 2006 22:12:19 +0000 (22:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 3 Jun 2006 22:12:19 +0000 (22:12 +0000)
     and bdb1cb195b21191dfe20d0c9d7089c2bcabad18e


Trivial merge