From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Jul 2006 14:59:18 +0000 (+0000)
Subject: merge of 09145a14348a2af665ea728569482e08b09fc8e3
X-Git-Tag: Release-2010-05/1~9453^2~1345^2~8^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1e85e122506700d5e37e099326b2e3c8740bdc8;p=openembedded.git

merge of 09145a14348a2af665ea728569482e08b09fc8e3
     and 814f9767254f5c0f553184e9854c534c3b22953a
---

d1e85e122506700d5e37e099326b2e3c8740bdc8