merge of 60c043fd54516cb786cb22ad9d4e45c007dd7386
authorMichael Lauer <mickey@vanille-media.de>
Sun, 21 May 2006 16:14:24 +0000 (16:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 May 2006 16:14:24 +0000 (16:14 +0000)
     and 741ca0595f53aa1061d415c78f7788109ca59183


Trivial merge