From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 20 Aug 2006 22:16:01 +0000 (+0000)
Subject: merge of 3608f3d5434271fde9ce2b2c787339675d8a532f
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15698992e9783ff1d6671ce8ffab2bfded396b95;p=openembedded.git

merge of 3608f3d5434271fde9ce2b2c787339675d8a532f
     and de381d3a29ee18e54e555b23be6bc70101eb1524
---

15698992e9783ff1d6671ce8ffab2bfded396b95