From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 27 Aug 2007 12:46:24 +0000 (+0000)
Subject: merge of '2f5bd4fb087c959aaf282ec818451c284de8277c'
X-Git-Tag: Release-2010-05/1~8789^2~8^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c08eeb8f1bee8ce78dee1f0e3cb8064b7b677ea8;p=openembedded.git

Merge ... '2f5bd4fb087c959aaf282ec818451c284de8277c'
     and 'b23b25b1fe0555089f3535775690edbf9ad885f0'
---

c08eeb8f1bee8ce78dee1f0e3cb8064b7b677ea8