From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 15 Sep 2006 01:00:45 +0000 (+0000)
Subject: merge of '423d95142798353c0c747b9d7ffc72e03ddd60c0'
X-Git-Tag: Release-2010-05/1~9453^2~802
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e80c658fb39ca3f2532a0d45999e45b242e6b782;p=openembedded.git

Merge ... '423d95142798353c0c747b9d7ffc72e03ddd60c0'
     and 'a63e4a781a841ff8a30e02e98663e945da2f1c63'
---

e80c658fb39ca3f2532a0d45999e45b242e6b782