merge of 50b29d3f0371ac55da68a61f56708b4328771ff8
authorMichael Lauer <mickey@vanille-media.de>
Thu, 8 Sep 2005 13:18:05 +0000 (13:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Sep 2005 13:18:05 +0000 (13:18 +0000)
     and 720e5c152e58498fce88b9b5ca79a6b34544f057


Trivial merge