From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 7 Sep 2006 16:32:05 +0000 (+0000)
Subject: merge of 0a9ecefe53a365e158ea60774a322f0f6c3557b4
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52b9d76ca05a6eb842624b728eed64f3b32b3f4a;p=openembedded.git

merge of 0a9ecefe53a365e158ea60774a322f0f6c3557b4
     and 2febf377486cc323b811be579e1fd1a7d891cee6
---

52b9d76ca05a6eb842624b728eed64f3b32b3f4a