merge of 879120a741aec05639064e380f443dc99cf4ad9d
authorMichael Lauer <mickey@vanille-media.de>
Fri, 24 Mar 2006 11:25:46 +0000 (11:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 24 Mar 2006 11:25:46 +0000 (11:25 +0000)
     and dc67cfbdff715876fef8d430aad9f1b1b57abb78


Trivial merge