From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 4 Sep 2006 10:33:12 +0000 (+0000)
Subject: merge of ce714db58c973fa4c07bd3981ba8c3fbddb04e64
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^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=545f2410ade270093a3a90363c852ced2e7579d2;p=openembedded.git

merge of ce714db58c973fa4c07bd3981ba8c3fbddb04e64
     and e9396fac0f052fa56bf2461d1e8e9352cbcf409d
---

545f2410ade270093a3a90363c852ced2e7579d2