From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 13 Jun 2007 17:31:37 +0000 (+0000)
Subject: merge of 'bc14395624375a26acbbd5e4c92900e2e5e456f0'
X-Git-Tag: Release-2010-05/1~8868^2~393
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49fc40335631daf60d2ead73ca6e346d52b0f305;p=openembedded.git

Merge ... 'bc14395624375a26acbbd5e4c92900e2e5e456f0'
     and 'dfe282821bb00a1e4097acfcf4e97e3d5169bdc4'
---

49fc40335631daf60d2ead73ca6e346d52b0f305