From: Adrian Davey <ade@beth2.org>
Date: Wed, 13 Sep 2006 16:12:04 +0000 (+0000)
Subject: merge of '366f83dc734476009ff4e31f1729e97e922e72d1'
X-Git-Tag: Release-2010-05/1~9453^2~827^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ed06af95a01ed9842ae1d5b0028688d7771ead9;p=openembedded.git

Merge ... '366f83dc734476009ff4e31f1729e97e922e72d1'
     and '894f5db8ff44cdd69177bc516f795dc19ade0dab'
---

0ed06af95a01ed9842ae1d5b0028688d7771ead9