From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 16 Aug 2006 07:16:14 +0000 (+0000)
Subject: merge of 1f4c2145f640e8561c02654dabbab8cdb20ba0ef
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2^2^2~5^2^2~4^2^2~2^2^2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9ad03827bc29b1cdd169b80f3986b5ccf2e6126;p=openembedded.git

merge of 1f4c2145f640e8561c02654dabbab8cdb20ba0ef
     and 4964eb1f2444138d2350558b495ecc4dc6b97f31
---

e9ad03827bc29b1cdd169b80f3986b5ccf2e6126