From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 24 Apr 2006 20:46:00 +0000 (+0000)
Subject: merge of 718895e358e441c13f030839cde1f2afd9525837
X-Git-Tag: Release-2010-05/1~9453^2~1865^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bb07b1bb372d80c0c0ae48440b7312650082340;p=openembedded.git

merge of 718895e358e441c13f030839cde1f2afd9525837
     and ac0211db57ef3b498cdc5cc32344b9c2073b87d4
---

3bb07b1bb372d80c0c0ae48440b7312650082340