From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 18 Aug 2005 04:14:37 +0000 (+0000)
Subject: merge of 185405646e0484ff489d7bc195a40be8bfe36861
X-Git-Tag: Release-2010-05/1~9453^2~3879^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ed2ce59aa613dde0f5d9d8579edb7330a00353b;p=openembedded.git

merge of 185405646e0484ff489d7bc195a40be8bfe36861
     and 220fba21be479c672bf9c87ec9e8d18ced2b3443
---

4ed2ce59aa613dde0f5d9d8579edb7330a00353b