From: Koen Kooi <koen@openembedded.org>
Date: Wed, 29 Nov 2006 17:32:55 +0000 (+0000)
Subject: merge of '34c552438e2e3487f826b3198c4bdf7e1445e77e'
X-Git-Tag: Release-2010-05/1~9453^2~224
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd43ce1199d5038e03040878c919498e7f05cfdf;p=openembedded.git

Merge ... '34c552438e2e3487f826b3198c4bdf7e1445e77e'
     and '50cf42d4e0e7f04c4f5e02dbeeaac10fd228c58d'
---

fd43ce1199d5038e03040878c919498e7f05cfdf