merge of 301eec9b699901af861fb29a8cebbe1e1b608b1f
authorMichael Lauer <mickey@vanille-media.de>
Wed, 7 Sep 2005 14:26:25 +0000 (14:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 14:26:25 +0000 (14:26 +0000)
     and 692e8d4a1e59eedb7b14074d84e2c5438e48808d


Trivial merge