From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 25 Aug 2006 11:01:41 +0000 (+0000)
Subject: merge of 4f8c11414ad697385b2ce842aa14e9c5d02a1167
X-Git-Tag: Release-2010-05/1~9453^2~837^2~1^2^2~1^2~3^2~1^2~1^2^2^2^2^2^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19b314f1095e841f8518027a22470e8b82c6d550;p=openembedded.git

merge of 4f8c11414ad697385b2ce842aa14e9c5d02a1167
     and 95637c29b1fae92f53101dae9f8d21e0331ef040
---

19b314f1095e841f8518027a22470e8b82c6d550