merge of 3aa50a835b9cb17bb8bfd3632f5b0ed705e72497
authorMichael Lauer <mickey@vanille-media.de>
Mon, 26 Sep 2005 22:57:12 +0000 (22:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 Sep 2005 22:57:12 +0000 (22:57 +0000)
     and 5d8bca6d9c7f630730b3e833e5a667b6987ccd1d


Trivial merge