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

merge of 2c0395eca082dabb6df91167e7e74e4868212e32
     and 9c24baa55e4e98a8831ec77b7700b39932762e4f
---

19ee380b5988acfdcd86d868346b68e50b3b41cb