From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 20 Mar 2006 11:25:10 +0000 (+0000)
Subject: merge of 135034cf51fecc3c52b45d1a26261b3b2d93bac6
X-Git-Tag: Release-2010-05/1~9453^2~2202^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08c9337a82e50e26565453b3242396a127ef98c2;p=openembedded.git

merge of 135034cf51fecc3c52b45d1a26261b3b2d93bac6
     and 599ce309bcded85efa1ed80fedea59fce4bb01ed
---

08c9337a82e50e26565453b3242396a127ef98c2