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

Merge ... '0c9e50018774b72d8f37660e72fcf552899350bf'
     and '1df29e1460d8a531894547a2df150e7ba591c83d'
---

5e93e3072009a89783ec3ff49a4f824700b3d215