From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 6 Mar 2007 12:47:35 +0000 (+0000)
Subject: merge of '68a7e26996faf9485b677d7a33ff7d762732355a'
X-Git-Tag: Release-2010-05/1~9088^2^2^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df430263a73e0955d2d457dd6f4da9f67c3657d9;p=openembedded.git

Merge ... '68a7e26996faf9485b677d7a33ff7d762732355a'
     and 'a33060785662f1407a1d47f9e23df18b384ec12b'
---

df430263a73e0955d2d457dd6f4da9f67c3657d9