From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 26 Aug 2006 14:31:01 +0000 (+0000)
Subject: merge of 011c3c348c03c4f7a5e1be3d10b2a7000ad4fadf
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4097d7c0066729d3e6eb9b8401f8439b4e1bd4f;p=openembedded.git

merge of 011c3c348c03c4f7a5e1be3d10b2a7000ad4fadf
     and 296e061a63c8fb02a900c71e3361ba42c55e434f
---

c4097d7c0066729d3e6eb9b8401f8439b4e1bd4f