From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 25 Aug 2006 10:01:04 +0000 (+0000)
Subject: merge of 368fcbfed04b858aa5bba38e2e7d3b49eea16c69
X-Git-Tag: Release-2010-05/1~9453^2~878^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9c6534f574776fd0bb9aa9333ebc832f578846f;p=openembedded.git

merge of 368fcbfed04b858aa5bba38e2e7d3b49eea16c69
     and 53526775d6ee970cc212293fcfa79e27b87e4a5b
---

f9c6534f574776fd0bb9aa9333ebc832f578846f