merge of 12fab859e46a5b7c800c685dd8a3595e6e74c5e7
authorMichael Lauer <mickey@vanille-media.de>
Thu, 1 Jun 2006 19:50:50 +0000 (19:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Jun 2006 19:50:50 +0000 (19:50 +0000)
     and 1d06e6b15d2905a1cad4fc0f31a004a369b66d1c


Trivial merge