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

merge of 3b94c2b62aa3d16cfec8b3b660e4a5960163ada7
     and b64396ce3d5654be49c78631e77235e16dd81e86
---

bbb2ae6a49bd5e986a7c57abd7421f1650a661cc