From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Wed, 13 Aug 2008 21:03:19 +0000 (+0000)
Subject: merge of '11752201b0467d112cbc4a2fd6b4e3bafa1a66a2'
X-Git-Tag: Release-2010-05/1~6333^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dca6669ef90362cd04fe00cd13d2fc3789da54db;p=openembedded.git

Merge ... '11752201b0467d112cbc4a2fd6b4e3bafa1a66a2'
     and '461b0f25ec4df76026bbc143ddf9a76a9690fd9e'
---

dca6669ef90362cd04fe00cd13d2fc3789da54db