From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 25 Dec 2006 15:47:06 +0000 (+0000)
Subject: merge of 63008daf27328c2ed40b755ed2f79949ddb01818
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~3^2~1^2~1^2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb60562654685f3dfc6d84ac7977f9139e9f2b75;p=openembedded.git

merge of 63008daf27328c2ed40b755ed2f79949ddb01818
     and 9f4b88f2eb3af46a32b6c78826cca8aae6d89268
---

cb60562654685f3dfc6d84ac7977f9139e9f2b75