From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 14 Mar 2007 11:13:11 +0000 (+0000)
Subject: merge of '35bc21cf1b2318f1e968c556b78030020a92784c'
X-Git-Tag: Release-2010-05/1~8868^2~1092^2~1^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e938931bee988f2887f7960b549b1c4600bf125b;p=openembedded.git

Merge ... '35bc21cf1b2318f1e968c556b78030020a92784c'
     and '5fceee071a84c0c747e3cd6e3ad0d552c50c34eb'
---

e938931bee988f2887f7960b549b1c4600bf125b