From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 5 Sep 2006 14:31:24 +0000 (+0000)
Subject: merge of 33f4be1133cebee4982e71a112c41019f41018c7
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~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68be0b3658eca29fa581628d2734ae9327826c9f;p=openembedded.git

merge of 33f4be1133cebee4982e71a112c41019f41018c7
     and c6ec5439acd914995223480fe072be1b263ab120
---

68be0b3658eca29fa581628d2734ae9327826c9f