merge of 551b99b264a271c5af4896cd57b97354be2f16ab
authorMichael Lauer <mickey@vanille-media.de>
Sun, 14 May 2006 20:29:04 +0000 (20:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 May 2006 20:29:04 +0000 (20:29 +0000)
     and 5ae554cda8a73547164d9102e1fb7f3a9f9fe6ec


Trivial merge