merge of 427dc4e4b02069584f06135f74bd23cb80490c8b
authorMichael Lauer <mickey@vanille-media.de>
Sun, 11 Sep 2005 18:07:53 +0000 (18:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Sep 2005 18:07:53 +0000 (18:07 +0000)
     and db10c295cf58e5701efeb931273b72f3ab0dbdd1


Trivial merge