From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 16 Jan 2006 14:17:33 +0000 (+0000)
Subject: merge of 40dd65ee679ec60cc190d4c6be30ff366e22f0db
X-Git-Tag: Release-2010-05/1~9455^2~2641^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05d03e47e5a5d3ed7a2cfc6860966a415ae7ddf6;p=openembedded.git

merge of 40dd65ee679ec60cc190d4c6be30ff366e22f0db
     and 8430d0607315085d8609a176b022ef4857edf05f
---

05d03e47e5a5d3ed7a2cfc6860966a415ae7ddf6