From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 6 Mar 2007 15:18:33 +0000 (+0000)
Subject: merge of '06296810795c121aba4a5607d1e6e154bec0c768'
X-Git-Tag: Release-2010-05/1~9088^2^2^2~9^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c9d775db1ca48d0e14034284d51c33dd44904a4;p=openembedded.git

Merge ... '06296810795c121aba4a5607d1e6e154bec0c768'
     and 'eb7e5bf33c6692e556183f311e95eb606e10c626'
---

2c9d775db1ca48d0e14034284d51c33dd44904a4