merge of aa37801871f021c37b88d43fee5f45ca91367b15
authorMichael Lauer <mickey@vanille-media.de>
Sun, 3 Jul 2005 17:15:57 +0000 (17:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 3 Jul 2005 17:15:57 +0000 (17:15 +0000)
     and e3937d4018e11d782f3524b4d0dec996e597894d


Trivial merge