From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 14 Jun 2005 23:52:17 +0000 (+0000)
Subject: merge of 'e0d0eae226575307c1c07c99b453f1eada2a1773'
X-Git-Tag: Release-2010-05/1~9456
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea6b49619860c64c1090a6f26ea8b4210e404b69;p=openembedded.git

Merge ... 'e0d0eae226575307c1c07c99b453f1eada2a1773'
     and 'fbff716710a0fbeca3a08e0e2b2401a4b5bbaec6'
---

ea6b49619860c64c1090a6f26ea8b4210e404b69