merge of bcb91ddbe21b7a5889fe98f3853d19ddcb2471cb
authorMichael Lauer <mickey@vanille-media.de>
Fri, 24 Mar 2006 10:28:25 +0000 (10:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 24 Mar 2006 10:28:25 +0000 (10:28 +0000)
     and ff499565cdf6658417de4beeeba44d618266fd0d


Trivial merge