From: Phil Blundell <philb@gnu.org>
Date: Tue, 15 Aug 2006 10:17:26 +0000 (+0000)
Subject: merge of '42a6f62802ccaf34d8896404bd4683dc7111232f'
X-Git-Tag: Release-2010-05/1~9453^2~957
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7663d5163ee64710fa9e9a2406eb94fcc4cec61;p=openembedded.git

Merge ... '42a6f62802ccaf34d8896404bd4683dc7111232f'
     and '6f8490048134c6e6b72e44c0685e72338477cc2a'
---

c7663d5163ee64710fa9e9a2406eb94fcc4cec61