From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 15 Nov 2007 13:55:30 +0000 (+0000)
Subject: merge of '041f9e5cc40f4d0d18d63d1ad086c1f42ecf15e8'
X-Git-Tag: Release-2010-05/1~8397
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12bbfc94ec84e9b899d7d519aaf1181ef2590183;p=openembedded.git

Merge ... '041f9e5cc40f4d0d18d63d1ad086c1f42ecf15e8'
     and '7f5c53f2fa166aff72aba4062607f641a2050e32'
---

12bbfc94ec84e9b899d7d519aaf1181ef2590183