From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 14 Jul 2005 00:02:49 +0000 (+0000)
Subject: merge of 2117dd5b726765202daffe67318297ef78df5a4f
X-Git-Tag: Release-2010-05/1~9453^2~4173
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0492c23bce509d6623697dc0a55828be3be1ba3;p=openembedded.git

merge of 2117dd5b726765202daffe67318297ef78df5a4f
     and 2913dd5a4db27b7b121a13b703b88a41e73464aa
---

c0492c23bce509d6623697dc0a55828be3be1ba3