From: Philip Balister <philip@balister.org>
Date: Tue, 2 Oct 2007 19:36:31 +0000 (+0000)
Subject: merge of '6d07e119d774985e157fc9a56bb59bfbe0dcec50'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~128^2~11^2~20^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f60c93e3d8b0c7f46a9d7ad325b01b11d3d2fa33;p=openembedded.git

Merge ... '6d07e119d774985e157fc9a56bb59bfbe0dcec50'
     and '7604e2e8a0c76d28ec378a7800c3e1a42b335da5'
---

f60c93e3d8b0c7f46a9d7ad325b01b11d3d2fa33