From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 24 Oct 2007 15:00:20 +0000 (+0000)
Subject: merge of '0ae58917d460020990b038630d35c74df4f95059'
X-Git-Tag: Release-2010-05/1~8454^2~120^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=136159f890a75bdb5ee83d5870686e91510d3bb1;p=openembedded.git

Merge ... '0ae58917d460020990b038630d35c74df4f95059'
     and '29ae2e348466eb7f810574927b181421a8412e70'
---

136159f890a75bdb5ee83d5870686e91510d3bb1