From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 3 May 2008 22:44:02 +0000 (+0000)
Subject: merge of '2ee8158109b81fad266d6373b64175e13ea659e4'
X-Git-Tag: Release-2010-05/1~7036
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a9276de8f5d2f6f1f4826659b4fbb00cd4b694f;p=openembedded.git

Merge ... '2ee8158109b81fad266d6373b64175e13ea659e4'
     and 'f2a34edab33cdaedb8303991dc23cc54c1c370ff'
---

6a9276de8f5d2f6f1f4826659b4fbb00cd4b694f