From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 18 Jun 2007 04:59:15 +0000 (+0000)
Subject: merge of '702a5081576a1863ce14aecd10fdbf425bc547af'
X-Git-Tag: Release-2010-05/1~8868^2~328^2~1^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6df26d6de49d504397c03f286983c8826b34696;p=openembedded.git

Merge ... '702a5081576a1863ce14aecd10fdbf425bc547af'
     and 'bdfe6dfd282c298e62007b6885e28ab01463c4bb'
---

c6df26d6de49d504397c03f286983c8826b34696