From: Koen Kooi <koen@openembedded.org>
Date: Mon, 17 Apr 2006 12:42:48 +0000 (+0000)
Subject: merge of 1db2f2b8a272dbada8a2ce16756fbd5d1e2a143d
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~8^2~105
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=023e076d6f391b096e66f9d5bdfcfc8bbe3cb84a;p=openembedded.git

merge of 1db2f2b8a272dbada8a2ce16756fbd5d1e2a143d
     and 2e6ce2c10f58ef5ccf8c16264fdf62c387da283c
---

023e076d6f391b096e66f9d5bdfcfc8bbe3cb84a