From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 18 Oct 2006 08:47:32 +0000 (+0000)
Subject: merge of '5714dc17618d88e298075289acf0db24fc8d8179'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~114
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99f98adab43bfd4b3b46951ab7f6ae2c510950e6;p=openembedded.git

Merge ... '5714dc17618d88e298075289acf0db24fc8d8179'
     and 'e9e4facf5e2c540845fd66ca9fae5809aff22e64'
---

99f98adab43bfd4b3b46951ab7f6ae2c510950e6