From: Philip Balister <philip@balister.org>
Date: Thu, 8 Mar 2007 17:14:53 +0000 (+0000)
Subject: merge of '0038f02055e33a3dad0ba914de112ce9450c45d4'
X-Git-Tag: Release-2010-05/1~8868^2~1105^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a6411d2a1ec1cdacc6f95c95bafb399283f430b;p=openembedded.git

Merge ... '0038f02055e33a3dad0ba914de112ce9450c45d4'
     and '63be5372eff18386938a49223024bae37d7978a9'
---

2a6411d2a1ec1cdacc6f95c95bafb399283f430b