From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 1 Nov 2005 13:01:46 +0000 (+0000)
Subject: merge of 35381e2f28108843e0f9b4730ba70e7a3a763056
X-Git-Tag: Release-2010-05/1~9453^2~3155
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=709574db0efb50ea9e001129dd73f02155f8617c;p=openembedded.git

merge of 35381e2f28108843e0f9b4730ba70e7a3a763056
     and eb8f26d3b2c8dc452c684af8fbc595b6ed6061fe
---

709574db0efb50ea9e001129dd73f02155f8617c