From: Koen Kooi <koen@openembedded.org>
Date: Sat, 27 Aug 2005 18:13:49 +0000 (+0000)
Subject: merge of 982bd6dee5de1d8614e7b6dca3d8ff2864d9be56
X-Git-Tag: Release-2010-05/1~9453^2~3775
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69016e2acd392b601b9f34b9805711fa007ae937;p=openembedded.git

merge of 982bd6dee5de1d8614e7b6dca3d8ff2864d9be56
     and afe5b334025f7a057bb991cd4da6a637f11a8310
---

69016e2acd392b601b9f34b9805711fa007ae937