From: Philip Balister <philip@balister.org>
Date: Fri, 23 May 2008 18:16:06 +0000 (+0000)
Subject: merge of '77248faae336ad5f2532155f6855f3432b14ff29'
X-Git-Tag: Release-2010-05/1~6880^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=424bb545a1b0d95436f4f419be2c79b24bd2c909;p=openembedded.git

Merge ... '77248faae336ad5f2532155f6855f3432b14ff29'
     and '7cf3999d32b721cc9cea1f3206f20979063615b8'
---

424bb545a1b0d95436f4f419be2c79b24bd2c909