From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 12 Jul 2005 19:38:56 +0000 (+0000)
Subject: merge of 18847e62fc2cebf8bf5fbc961455a822595bd286
X-Git-Tag: Release-2010-05/1~9453^2~4178^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9882483062e7eaca44216ce7e9ddba8b1519a211;p=openembedded.git

merge of 18847e62fc2cebf8bf5fbc961455a822595bd286
     and 6c3b68859e9aa7efedb7c4086501226686cad2cc
---

9882483062e7eaca44216ce7e9ddba8b1519a211