merge of 6d1ae8b64aef6872327fda9386a4c9de48ac51ad
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Apr 2006 21:57:24 +0000 (21:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Apr 2006 21:57:24 +0000 (21:57 +0000)
     and cf0ac36eb0b92807b4cbaa71705e63023abf1cca


Trivial merge