From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 23 Jan 2008 16:57:37 +0000 (+0000)
Subject: merge of '8e8a1c48faec2dc479cec1aee6c9031525ea9306'
X-Git-Tag: Release-2010-05/1~7838^2~15^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e3d17710c3059dce30901211439ce5124f0372d;p=openembedded.git

Merge ... '8e8a1c48faec2dc479cec1aee6c9031525ea9306'
     and 'ec7917dc2ea4817a839295ebf8a8cb597ebb04ff'
---

2e3d17710c3059dce30901211439ce5124f0372d