From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 24 Aug 2006 18:16:24 +0000 (+0000)
Subject: merge of 593627942ba1a6623af7a814fb51159b1de235c1
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24cdf97d8c123de7d775f0f2f637e12cd11f08e0;p=openembedded.git

merge of 593627942ba1a6623af7a814fb51159b1de235c1
     and a58c0e0709f6185e35a7877d37ce4471c2673621
---

24cdf97d8c123de7d775f0f2f637e12cd11f08e0