From: Philip Balister <philip@balister.org>
Date: Wed, 25 Apr 2007 02:02:01 +0000 (+0000)
Subject: merge of '32161ed8fe97769fa75537a6e2cce7e2a202a301'
X-Git-Tag: Release-2010-05/1~8868^2~660^2~50
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68cd011ec6ba2ab673b204977481b2348108795f;p=openembedded.git

Merge ... '32161ed8fe97769fa75537a6e2cce7e2a202a301'
     and 'bb1689f72c4d6e5659fe4a1b0b32c2ce23922e8a'
---

68cd011ec6ba2ab673b204977481b2348108795f