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

merge of 1aee6898e54c0e2037c99cd8999670a4fe1c0c02
     and 348eb2d8dd45b73446471873775d8e248e67bd32
---

86d9211f52171f3367ce974b997e16864e20118d