merge of 9c0265ee62d37de050c68ecb28894baf95259be9
authorMichael Lauer <mickey@vanille-media.de>
Sun, 17 Jul 2005 23:29:04 +0000 (23:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 17 Jul 2005 23:29:04 +0000 (23:29 +0000)
     and ca2bea4d24652633389a1f553be61c6b824f3b72


Trivial merge