merge of 3a5832d4912a64e85b05315eb3993311efbecb59
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Jul 2006 14:41:07 +0000 (14:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Jul 2006 14:41:07 +0000 (14:41 +0000)
     and f98077b2233306af226b7ac750bc1184a00e83f3


Trivial merge