From: Koen Kooi <koen@openembedded.org>
Date: Mon, 3 Oct 2005 18:46:08 +0000 (+0000)
Subject: merge of 87173fb74721cf392e0e3b101c9f04c6b8e7f02d
X-Git-Tag: Release-2010-05/1~9453^2~3380^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b5075fa761e23d7e4e6550dcbcf3eb5fafdf7d2;p=openembedded.git

merge of 87173fb74721cf392e0e3b101c9f04c6b8e7f02d
     and c3faa03a1a4d2231cb4f0f7fa31dac6d4b183100
---

6b5075fa761e23d7e4e6550dcbcf3eb5fafdf7d2