From: Philip Balister <philip@balister.org>
Date: Tue, 15 May 2007 17:11:58 +0000 (+0000)
Subject: merge of '74fc3044282473d52ab00992eddb5d72da74e7ff'
X-Git-Tag: Release-2010-05/1~8868^2~491
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83a018e452ca4a8d38b641d05c8eebdd1cb300c1;p=openembedded.git

Merge ... '74fc3044282473d52ab00992eddb5d72da74e7ff'
     and 'dcf242dc6723b2c4841dad9bc8a5bca9179f0d5f'
---

83a018e452ca4a8d38b641d05c8eebdd1cb300c1