From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Mon, 15 Jan 2007 13:46:57 +0000 (+0000)
Subject: merge of '5ef2df46443fbfb188838c57e128f0f14f7de196'
X-Git-Tag: Release-2010-05/1~9366^2~2^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be50329892ab6ad863ca000c3c3e46d9b467d24c;p=openembedded.git

Merge ... '5ef2df46443fbfb188838c57e128f0f14f7de196'
     and 'fe9ed3d77ab6f18d444f2c2c311d06b0cc5ab756'
---

be50329892ab6ad863ca000c3c3e46d9b467d24c