From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Mon, 12 May 2008 13:45:26 +0000 (+0000)
Subject: merge of '07638b4b82998b594ffb4858eaca86494159cda0'
X-Git-Tag: Release-2010-05/1~6950
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf8862b4aea28a42a0dcdfdc618c2ff5ceb11cf9;p=openembedded.git

Merge ... '07638b4b82998b594ffb4858eaca86494159cda0'
     and '1019be7986524fea8a63da6199f04430a64cd018'
---

bf8862b4aea28a42a0dcdfdc618c2ff5ceb11cf9