From: Philip Balister <philip@balister.org>
Date: Tue, 3 Apr 2007 20:05:14 +0000 (+0000)
Subject: merge of '3c255d53746782abcd12637930247f2e27ff6f65'
X-Git-Tag: Release-2010-05/1~8868^2~820
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd5a1666732a1f632bb9dc324687eb1c5ea445bd;p=openembedded.git

Merge ... '3c255d53746782abcd12637930247f2e27ff6f65'
     and 'a2c784251c461fa5a6f763a02d072f25e0c56226'
---

dd5a1666732a1f632bb9dc324687eb1c5ea445bd