merge of 5c8caead42a2c879d5b9eb133d13144c60bf2346
authorMichael Lauer <mickey@vanille-media.de>
Mon, 1 Aug 2005 09:45:42 +0000 (09:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Aug 2005 09:45:42 +0000 (09:45 +0000)
     and 62eeefaa89d513cdd098f1ea6a4495d34289f621


Trivial merge