From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 21 May 2006 12:35:59 +0000 (+0000)
Subject: merge of 32d7375b2a5f945b8a425da76292506a65ac81eb
X-Git-Tag: Release-2010-05/1~9453^2~1553^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=405b9c56fd921db33cc33b723145eb0453bf89a8;p=openembedded.git

merge of 32d7375b2a5f945b8a425da76292506a65ac81eb
     and cb0c84fd84771c6e5354c1cd86a89fd04cfbced1
---

405b9c56fd921db33cc33b723145eb0453bf89a8