From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 9 Sep 2006 13:01:28 +0000 (+0000)
Subject: merge of 1d8d4652861445b6f8025839c6f6ab8500ee07ec
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8668418df6e97ba2579b8152184e9fdc7b5e83dd;p=openembedded.git

merge of 1d8d4652861445b6f8025839c6f6ab8500ee07ec
     and 38f8d73bd80424075b07707fb224234553155085
---

8668418df6e97ba2579b8152184e9fdc7b5e83dd