From: Koen Kooi <koen@openembedded.org>
Date: Thu, 9 Nov 2006 15:24:42 +0000 (+0000)
Subject: merge of '051aed6118dfe66775aef988fe3b9f0792cf80a9'
X-Git-Tag: Release-2010-05/1~9453^2~481^2~3^2~35
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f294e6042d2305e7d24b19ec057f9ab5fa5a2b5;p=openembedded.git

Merge ... '051aed6118dfe66775aef988fe3b9f0792cf80a9'
     and 'fa33212259d3560df37f96b6f67954807659b438'
---

7f294e6042d2305e7d24b19ec057f9ab5fa5a2b5