From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 17 Jun 2007 07:26:38 +0000 (+0000)
Subject: merge of 'af152d47ebbb835213adc897491fd19ccf8b4e1d'
X-Git-Tag: Release-2010-05/1~8868^2~328^2~1^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46409b6477e77bd8c059f9b76be6e0b569074a22;p=openembedded.git

Merge ... 'af152d47ebbb835213adc897491fd19ccf8b4e1d'
     and 'b35bb3933a3e76175b51e40e2c83fdf1aafa3ed8'
---

46409b6477e77bd8c059f9b76be6e0b569074a22