From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 4 Apr 2006 20:35:19 +0000 (+0000)
Subject: merge of 5a8084e08b69c9be4be7facebd4b8b54f2517284
X-Git-Tag: Release-2010-05/1~9453^2~2102
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6998b703e74d8dfc71f0a87757811ae19238d656;p=openembedded.git

merge of 5a8084e08b69c9be4be7facebd4b8b54f2517284
     and 8155b665cd045405d46ba694ceca0de714a7b535
---

6998b703e74d8dfc71f0a87757811ae19238d656