From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 6 Feb 2006 00:16:26 +0000 (+0000)
Subject: merge of 65b0cd64eeef02b789460148d6bb958749417f11
X-Git-Tag: Release-2010-05/1~9453^2~2382^2~1^2^2^2~2^2^2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1be31761f3449cd4f92508fd2c2c41968039c918;p=openembedded.git

merge of 65b0cd64eeef02b789460148d6bb958749417f11
     and fe9207286fe795f141cfced1550795b360e1e971
---

1be31761f3449cd4f92508fd2c2c41968039c918