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

merge of 5992e9a1a1abd66e6753553c665d0e27fe718e72
     and eeb83bff57693c86cc75c70bfc1f74e07ce2bf72
---

e459c12feac09ca0259101dda3ec31f97ae759d8