From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 31 Oct 2005 21:02:02 +0000 (+0000)
Subject: merge of c6c35eab9b22af441a0f6e66d80fbe9d2816a22c
X-Git-Tag: Release-2010-05/1~9453^2~3162
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13a395cacb8cd0751f512b6739ccbe84476cb9ea;p=openembedded.git

merge of c6c35eab9b22af441a0f6e66d80fbe9d2816a22c
     and c8f0cab0302c6c8cace2907ecc789e1a08db2dc9
---

13a395cacb8cd0751f512b6739ccbe84476cb9ea