From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 1 Dec 2005 10:11:23 +0000 (+0000)
Subject: merge of 775b8969c1dd2afd0f16f9d2b27219b0d07bbe25
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29a0fc4e612029fa329585ba179f0a07bebc5fd1;p=openembedded.git

merge of 775b8969c1dd2afd0f16f9d2b27219b0d07bbe25
     and a0d07ed54f83502dfe281ee4cd5eeafbe00ac68b
---

29a0fc4e612029fa329585ba179f0a07bebc5fd1