merge of 4cfdadba6908591a58400b358f66aa5d7a5c2d9e
authorMichael Lauer <mickey@vanille-media.de>
Wed, 31 May 2006 15:46:29 +0000 (15:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 May 2006 15:46:29 +0000 (15:46 +0000)
     and fab9c0728e8095f1a2f9da508f583854558542f7


Trivial merge