From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 7 Sep 2006 03:01:21 +0000 (+0000)
Subject: merge of 16bf24d2ddd75cceb5a0d10172f1d2625719bad5
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2~1^2^2^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89c31f60e1add372e1867c4a7c714f75147b4525;p=openembedded.git

merge of 16bf24d2ddd75cceb5a0d10172f1d2625719bad5
     and ca5e13e477c9fa8b6935d2cff74d1c69f853750a
---

89c31f60e1add372e1867c4a7c714f75147b4525