From: Koen Kooi <koen@openembedded.org>
Date: Mon, 26 Jun 2006 18:08:28 +0000 (+0000)
Subject: merge of 11d7234c6c07e62a7ec6e5c77e57b47cbdafb16e
X-Git-Tag: Release-2010-05/1~9453^2~1420
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17f7549bce4c19982915b60b594bc345455a5ff8;p=openembedded.git

merge of 11d7234c6c07e62a7ec6e5c77e57b47cbdafb16e
     and db0a543fe9e50611a979e08c263802aa2fc2b824
---

17f7549bce4c19982915b60b594bc345455a5ff8