From: Koen Kooi <koen@openembedded.org>
Date: Mon, 8 Oct 2007 09:36:48 +0000 (+0000)
Subject: merge of '556711700dc782e2a3dae33b581a0f4b9d3bca2d'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~113^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=438e5f64402239782ab636d0bbafcbea98ec2e50;p=openembedded.git

Merge ... '556711700dc782e2a3dae33b581a0f4b9d3bca2d'
     and '9cb28749b896afea4fb911d08a7bb6f26df50332'
---

438e5f64402239782ab636d0bbafcbea98ec2e50