From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 29 Jul 2005 10:00:18 +0000 (+0000)
Subject: merge of acedaefff26954cb3841217cd873a7f0336de1f1
X-Git-Tag: Release-2010-05/1~9453^2~4005^2~18^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83fe3621cd87216dce4fefd8828807096a548fa7;p=openembedded.git

merge of acedaefff26954cb3841217cd873a7f0336de1f1
     and faa2fa21cd8b3913cea3925dafd04edf752bca02
---

83fe3621cd87216dce4fefd8828807096a548fa7