From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 17 Aug 2005 22:36:44 +0000 (+0000)
Subject: merge of 059ddb966f180b6beb2753809aff0ad72104f0cb
X-Git-Tag: Release-2010-05/1~9453^2~3879^2^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21c74a4b3f0aa949e0aabae7dd2c62682967dc07;p=openembedded.git

merge of 059ddb966f180b6beb2753809aff0ad72104f0cb
     and 90c2bc8ff57631e741bed8fa66cdfaecd2a75077
---

21c74a4b3f0aa949e0aabae7dd2c62682967dc07