From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 2 Dec 2005 10:33:21 +0000 (+0000)
Subject: merge of 542f6b46587305352d62fe667186ce8ecb2b961f
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1d97cf9af58b547348c14cf65c1e71ddb630b6b;p=openembedded.git

merge of 542f6b46587305352d62fe667186ce8ecb2b961f
     and beb867c2b9c7cc5d33068e9a46974e7650287391
---

f1d97cf9af58b547348c14cf65c1e71ddb630b6b