From: Philip Balister <philip@balister.org>
Date: Wed, 3 Oct 2007 23:37:55 +0000 (+0000)
Subject: merge of '841a5712bf3e160a32fddc18de65062237b46ed6'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~128^2~11^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=080e5e03b1d20427e0d441f47f4e231ba27747b2;p=openembedded.git

Merge ... '841a5712bf3e160a32fddc18de65062237b46ed6'
     and 'f73119cc933563eddde899dd80930c0dfb4625e3'
---

080e5e03b1d20427e0d441f47f4e231ba27747b2