From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 7 Jan 2006 09:00:39 +0000 (+0000)
Subject: merge of 0b0c66f0bd98363eff174839d98a20f34bc0e832
X-Git-Tag: Release-2010-05/1~9453^2~2717
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fbdad585b0137cecf62a86a6dac7e91a44505a6;p=openembedded.git

merge of 0b0c66f0bd98363eff174839d98a20f34bc0e832
     and c98db1adfa0a8714be1a5b9b7d8e8d86530e84de
---

1fbdad585b0137cecf62a86a6dac7e91a44505a6