merge of 573b5d78b5e0b180193dc60cf7ef9d57cb7fd657
authorMichael Lauer <mickey@vanille-media.de>
Sat, 13 Aug 2005 13:14:36 +0000 (13:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Aug 2005 13:14:36 +0000 (13:14 +0000)
     and e04b75b646ac55cc032131167fa27c9cb86945a2


Trivial merge