From: Philip Balister <philip@balister.org>
Date: Thu, 10 Aug 2006 22:43:16 +0000 (+0000)
Subject: merge of '0fee5c6e2897d294c4895897736141bed93199a1'
X-Git-Tag: Release-2010-05/1~9453^2~996
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f73c4261ac303c8e0c7cf7fed753a960ae18cc8;p=openembedded.git

Merge ... '0fee5c6e2897d294c4895897736141bed93199a1'
     and '113954a10c1eecc2f688fdb881e40dcd951cf598'
---

4f73c4261ac303c8e0c7cf7fed753a960ae18cc8