From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 15 Jan 2007 20:06:47 +0000 (+0000)
Subject: merge of '434de93cfa2e4d34e3f4a19e5bff6130398e5d8f'
X-Git-Tag: Release-2010-05/1~9366^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aef114162d66ed9f45e616b631701b988dc95137;p=openembedded.git

Merge ... '434de93cfa2e4d34e3f4a19e5bff6130398e5d8f'
     and '43c38f4dda9e1b6f193bd92c89479423586dbe59'
---

aef114162d66ed9f45e616b631701b988dc95137