merge of 6fc08cb0027e6ecc5ef10578e8c37a7b66f53bf9
authorMichael Lauer <mickey@vanille-media.de>
Wed, 18 Jan 2006 15:38:00 +0000 (15:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 15:38:00 +0000 (15:38 +0000)
     and 7eab4425d3ef00f6bc0fc9dcf55117c3cf8c24d6


Trivial merge