merge of 1ee22e5dc2cdeec8a88f1136a019329901a0c9f3
authorMichael Lauer <mickey@vanille-media.de>
Sat, 13 May 2006 23:07:17 +0000 (23:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 May 2006 23:07:17 +0000 (23:07 +0000)
     and b971ecbe14a98d023c916e28714ea42ab6a3b1d0


Trivial merge