From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 2 Apr 2007 15:57:09 +0000 (+0000)
Subject: merge of '6bc2006eb8eff633170fcf544612bf6bcc7be7be'
X-Git-Tag: Release-2010-05/1~8868^2~849^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86f1ccf58b2eab92ff7e65d9fe53ebcecc94bd5e;p=openembedded.git

Merge ... '6bc2006eb8eff633170fcf544612bf6bcc7be7be'
     and 'ead450bbb0c7341954f358ef2d76fc6268c68846'
---

86f1ccf58b2eab92ff7e65d9fe53ebcecc94bd5e