From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 6 Dec 2006 05:15:54 +0000 (+0000)
Subject: merge of 48b8740d774dc9eeaa0884be5c83aaf5f3201187
X-Git-Tag: Release-2010-05/1~9453^2~204^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52da0bdfcaf5c8d01ef59f49eb31d85bfb072cb2;p=openembedded.git

merge of 48b8740d774dc9eeaa0884be5c83aaf5f3201187
     and 660478592ecf7024f18439b76307db524c1bc948
---

52da0bdfcaf5c8d01ef59f49eb31d85bfb072cb2