From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 22 Jul 2005 15:10:08 +0000 (+0000)
Subject: merge of 113e53533fd379355156720bc34edd95b0322f33
X-Git-Tag: Release-2010-05/1~9453^2~4086^2~6^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2d37c5ae5adef08d6895c76e1e45ce8569e769a;p=openembedded.git

merge of 113e53533fd379355156720bc34edd95b0322f33
     and c4b803554ad0cca18de36fcb52185ce50dafc3b9
---

b2d37c5ae5adef08d6895c76e1e45ce8569e769a