From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 2 Aug 2005 00:31:12 +0000 (+0000)
Subject: merge of aa1a8be266cc5dcd001ac773999d164f125b29a2
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eea91968ada14180c77ade6d1a906fdb5ee73d90;p=openembedded.git

merge of aa1a8be266cc5dcd001ac773999d164f125b29a2
     and d5ca2d9089d0a71c3f006b3ef5b5a276d383f1c1
---

eea91968ada14180c77ade6d1a906fdb5ee73d90