merge of 0fb0ebb33b635bc17b0a13f6da59e6bd1b474b79
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Jul 2006 13:28:05 +0000 (13:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Jul 2006 13:28:05 +0000 (13:28 +0000)
     and a853b21c963bb2e9056ecffcbc9af65a6b73aa1f


Trivial merge