merge of 0b31d87c1b9bcc0d2789be6377713fc1adcc891a
authorMichael Lauer <mickey@vanille-media.de>
Mon, 6 Feb 2006 18:41:09 +0000 (18:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 18:41:09 +0000 (18:41 +0000)
     and 939b3d278f2da67c4ed00b67eabd89eb6d0c0f59


Trivial merge