merge of 53eb13501a2259cc700bd74c6a4d5b7022eb3d69
authorMichael Lauer <mickey@vanille-media.de>
Sun, 11 Sep 2005 20:59:08 +0000 (20:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Sep 2005 20:59:08 +0000 (20:59 +0000)
     and 7123616b4991ab3d5b73ef32b51e555cacf38b72


Trivial merge