merge of 4bea65581a76f2d570ab41485732af8db23f2559
authorMichael Lauer <mickey@vanille-media.de>
Mon, 22 May 2006 21:42:06 +0000 (21:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 May 2006 21:42:06 +0000 (21:42 +0000)
     and 958f273429afa22714e97b2c35ad0a3cd94dc248


Trivial merge