From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 18 Apr 2006 22:18:54 +0000 (+0000)
Subject: merge of 40d5e9c9fe36e79128f6aa23880c5666be230cfc
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~5^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=488948e734ad107639099e558f5e6fb7dde6d7d9;p=openembedded.git

merge of 40d5e9c9fe36e79128f6aa23880c5666be230cfc
     and a2ab0d3faec30d3c8b605acc999e9380620e2e5f
---

488948e734ad107639099e558f5e6fb7dde6d7d9