merge of 0e3cf43c8f55aec7cdc3b6f4ff71869298320085
authorMichael Lauer <mickey@vanille-media.de>
Sat, 6 Aug 2005 12:01:52 +0000 (12:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 6 Aug 2005 12:01:52 +0000 (12:01 +0000)
     and bc232d57e1fb3fa3c8e9f6e840e1bc9ecf3a7d55


Trivial merge