From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 18 Jan 2006 20:44:32 +0000 (+0000)
Subject: merge of 090d824302b4eb681059bf2d350c4ebd73925d94
X-Git-Tag: Release-2010-05/1~9453^2~2623
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e64c2fdff467c5ad785794b4d89dc8dd311b87d3;p=openembedded.git

merge of 090d824302b4eb681059bf2d350c4ebd73925d94
     and 4ab8fa05b99c9b1051a578b715835cf4ec7c28d3
---

e64c2fdff467c5ad785794b4d89dc8dd311b87d3