From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 2 Feb 2006 14:49:37 +0000 (+0000)
Subject: merge of 01783a925142e303a35b3d5011062c449f634fce
X-Git-Tag: Release-2010-05/1~9453^2~2458^2~15^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d74d62d73c5f6603ccb373da764e97e664d1a6bc;p=openembedded.git

merge of 01783a925142e303a35b3d5011062c449f634fce
     and 6d8ef5d4947f1ffacac1ee8f3b3dd79e90c4a5ba
---

d74d62d73c5f6603ccb373da764e97e664d1a6bc