From: Koen Kooi <koen@openembedded.org>
Date: Mon, 1 Aug 2005 09:56:43 +0000 (+0000)
Subject: merge of 4a52b2abf7680da958a90ec6fd03a53027731946
X-Git-Tag: Release-2010-05/1~9453^2~4014^2~4^2~24
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fd998e51b17d878a1b610f802c52926cde12e3d;p=openembedded.git

merge of 4a52b2abf7680da958a90ec6fd03a53027731946
     and 7ef6035dfceaecf4b902f0aa0277a7de73566580
---

2fd998e51b17d878a1b610f802c52926cde12e3d