From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 21 Feb 2006 02:16:42 +0000 (+0000)
Subject: merge of e2df25d795a5c294e29cab1435249894afc5d4ef
X-Git-Tag: Release-2010-05/1~9453^2~2304^2~101^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=434850c46ea25407707b3da17ebdd642bd577fa4;p=openembedded.git

merge of e2df25d795a5c294e29cab1435249894afc5d4ef
     and f0d5ff25a7f07c6a141dcc2b5a933a3c36e93695
---

434850c46ea25407707b3da17ebdd642bd577fa4