From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 1 Jan 2007 00:35:29 +0000 (+0000)
Subject: merge of 1222261ca62e414c7961ea346568199452af3ce8
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1^2~1^2~1^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e6259aeb43c89b6189c20c6c77c7876e1098c8b;p=openembedded.git

merge of 1222261ca62e414c7961ea346568199452af3ce8
     and 827786b88875352fb85c4d47c8e72f29b73dea05
---

7e6259aeb43c89b6189c20c6c77c7876e1098c8b