From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 11 Apr 2008 10:17:01 +0000 (+0000)
Subject: merge of 'a1b53f4890a543077cd9692d6f36d55601cf5cba'
X-Git-Tag: Release-2010-05/1~7216
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f18958d24640e545bedac5f4d6e30b6eef27134;p=openembedded.git

Merge ... 'a1b53f4890a543077cd9692d6f36d55601cf5cba'
     and 'e7f793242547302eb26367c08896596376eba484'
---

8f18958d24640e545bedac5f4d6e30b6eef27134