From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Thu, 30 Aug 2007 15:29:13 +0000 (+0000)
Subject: merge of '4fb1a7447c5d8ace96a5ac6358c7fe10f0d951c4'
X-Git-Tag: Release-2010-05/1~8777^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6aa02d77a8010fa65c91bb20b2093d7200654747;p=openembedded.git

Merge ... '4fb1a7447c5d8ace96a5ac6358c7fe10f0d951c4'
     and '969fb79142680f77b64829b367c495c5836d4327'
---

6aa02d77a8010fa65c91bb20b2093d7200654747