From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 4 Sep 2006 16:46:32 +0000 (+0000)
Subject: merge of 00814e88d1ac1a1abf18c310decb524a6edce347
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~1^2^2^2^2~5^2~1^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d8dceb9b5d3c4ba13687736276c7df1c075b506;p=openembedded.git

merge of 00814e88d1ac1a1abf18c310decb524a6edce347
     and f3e448498b7965e470d7ff3f7ddda9bb7921f71a
---

9d8dceb9b5d3c4ba13687736276c7df1c075b506