merge of f8284bbff196fac15cb8c1b32ae2ac3dcda6a7a8
authorMichael Lauer <mickey@vanille-media.de>
Wed, 18 Jan 2006 15:39:17 +0000 (15:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 15:39:17 +0000 (15:39 +0000)
     and 856b33429f931b2e6a9dab859111ff4c8b6111c2


Trivial merge