merge of 1a161e3d9f46581507d1542d1112d40c07481893
authorMichael Lauer <mickey@vanille-media.de>
Sun, 21 Aug 2005 23:27:23 +0000 (23:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Aug 2005 23:27:23 +0000 (23:27 +0000)
     and 80954f6b3dd012af79d0b0eecc7015cd1b46aa27


Trivial merge