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

merge of 1944e442d97092991784475bf4b8980e60c5c3fc
     and a71dcba6ac21f2393b7b32882bf6472904b57f2c
---

2dfff46eceb5db1d17cdf38ab7d112aa74b8ded9