From: Graeme Gregory <dp@xora.org.uk>
Date: Sun, 29 Jan 2006 20:45:46 +0000 (+0000)
Subject: merge of 34633137c0dcdd46422c42e3058d55cd967590bd
X-Git-Tag: Release-2010-05/1~9453^2~2505^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2228ad0352168c2686c945b7b481be0bacb3b193;p=openembedded.git

merge of 34633137c0dcdd46422c42e3058d55cd967590bd
     and dde70ffa9a39c0416ae2875c26c72ab5016c8850
---

2228ad0352168c2686c945b7b481be0bacb3b193