From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 25 Dec 2006 13:16:55 +0000 (+0000)
Subject: merge of 2b6e23ac68e02186b4ddae31bd8871b9569d0b55
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~3^2~1^2~1^2^2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c47b28ae0c04de9bc93d2a0c394420171bc42a9a;p=openembedded.git

merge of 2b6e23ac68e02186b4ddae31bd8871b9569d0b55
     and 3791e4d0585881b1bc482af64573bb6aa552fdd3
---

c47b28ae0c04de9bc93d2a0c394420171bc42a9a