From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 18 Dec 2006 22:03:53 +0000 (+0000)
Subject: merge of dff335f8dde5bf849d2853e349e6229867df0894
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2^2~1^2^2^2^2~6^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b146fa9d84c49b9871c4d3994f63e379a5704d62;p=openembedded.git

merge of dff335f8dde5bf849d2853e349e6229867df0894
     and e1e52b96e966b40d4b653afcff98834a02ae6fd5
---

b146fa9d84c49b9871c4d3994f63e379a5704d62