From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 22 May 2006 01:48:53 +0000 (+0000)
Subject: merge of 45908085bdceb2276493e588d8d89daba46b6d5c
X-Git-Tag: Release-2010-05/1~9453^2~1553^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe19b81b064bb612a85b11ac1b3ee8b40a7a72be;p=openembedded.git

merge of 45908085bdceb2276493e588d8d89daba46b6d5c
     and ec1cfabe499e84bf5627a49cc40bae42b557c638
---

fe19b81b064bb612a85b11ac1b3ee8b40a7a72be