merge of b527e063b110f80270c8dc87e41ce53a83d4870a
authorMichael Lauer <mickey@vanille-media.de>
Thu, 20 Apr 2006 14:42:43 +0000 (14:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 20 Apr 2006 14:42:43 +0000 (14:42 +0000)
     and c8b301a65a734bb6f775222ccee1d1e8e7372ba3


Trivial merge