From: Philip Balister <philip@balister.org>
Date: Tue, 28 Aug 2007 11:28:14 +0000 (+0000)
Subject: merge of '4990ba855f0ea2bae626b67500e77e88d48dabca'
X-Git-Tag: Release-2010-05/1~8789^2~5^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9dc18f05c344dc37214540d90550f72787265acc;p=openembedded.git

Merge ... '4990ba855f0ea2bae626b67500e77e88d48dabca'
     and '95e88a1838246f2647083a1824d4136e4b3f2073'
---

9dc18f05c344dc37214540d90550f72787265acc