From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 25 Aug 2006 00:01:14 +0000 (+0000)
Subject: merge of ac2124fc98391df1b17c8e6b7041eecdfa7543ed
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd3bbd0204c75832b662ae5ce686171b0438a9fb;p=openembedded.git

merge of ac2124fc98391df1b17c8e6b7041eecdfa7543ed
     and bd9e7e6ab916c283dd8aeed4ffd3aaf37239d2eb
---

fd3bbd0204c75832b662ae5ce686171b0438a9fb