From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 28 Jul 2005 07:50:48 +0000 (+0000)
Subject: merge of ce6f9ade2d3d21323b745d20061888943279bb6a
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~4^2~101
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48f558962b0c3dbeb1bac9e8555313b6a124c3be;p=openembedded.git

merge of ce6f9ade2d3d21323b745d20061888943279bb6a
     and f32d41db382da524a07b89fc5a7564293330eef4
---

48f558962b0c3dbeb1bac9e8555313b6a124c3be