From: Richard Purdie <rpurdie@rpsys.net>
Date: Tue, 27 Sep 2005 21:25:42 +0000 (+0000)
Subject: merge of 1e5ed75da89ccfd9e2b84471e321a4ef7aea7f14
X-Git-Tag: Release-2010-05/1~9453^2~3400
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=953a2e110313237a8dc255641eb4f9667ccbf83f;p=openembedded.git

merge of 1e5ed75da89ccfd9e2b84471e321a4ef7aea7f14
     and 6c4836f3c8b3446186ac9adbcf4d2dc5c9211f0b
---

953a2e110313237a8dc255641eb4f9667ccbf83f