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

merge of 35da8616b46733437d9b9af709c5592a40de3a47
     and eaa8c25e37e474d3d3d4444854fecf8b9e5d2c03
---

69dc24a83d1e130418278d79ca6b1911040978b4