From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 27 Aug 2006 17:31:19 +0000 (+0000)
Subject: merge of 48ae35df5bbd7e08a5f1ce6f0ef4e35abc956615
X-Git-Tag: Release-2010-05/1~9453^2~837^2~1^2^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a964dcbb6ccacf0ce9619734b9b4d5affb5e8690;p=openembedded.git

merge of 48ae35df5bbd7e08a5f1ce6f0ef4e35abc956615
     and b4baa952a21796f3da8adaf6acd8c844668a33d8
---

a964dcbb6ccacf0ce9619734b9b4d5affb5e8690