From: Koen Kooi <koen@openembedded.org>
Date: Wed, 3 Aug 2005 09:41:04 +0000 (+0000)
Subject: merge of 7a7b09b428b0fc588bb40bec9d545736c70956e8
X-Git-Tag: Release-2010-05/1~9453^2~3994^2~27
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11a2c0bf83920ce4c312883ca17ad27ef3705eee;p=openembedded.git

merge of 7a7b09b428b0fc588bb40bec9d545736c70956e8
     and 7ab1b01cd9231fe128eea9ab71f6ec45d2dbd6bf
---

11a2c0bf83920ce4c312883ca17ad27ef3705eee