From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 19 Dec 2006 17:17:56 +0000 (+0000)
Subject: merge of 12aefbb866697c7ce0a93febeaa40af2622a8ac2
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d2377048f43f62a9b37f37ff7563b9af9f14a8f;p=openembedded.git

merge of 12aefbb866697c7ce0a93febeaa40af2622a8ac2
     and 29f0b10dc5e62ff3a65a17a998198e438d36f80f
---

5d2377048f43f62a9b37f37ff7563b9af9f14a8f