From: Koen Kooi <koen@openembedded.org>
Date: Sun, 28 Aug 2005 14:37:26 +0000 (+0000)
Subject: merge of d1b5c87dce377ea2c44f56b5dc50a30a516622d8
X-Git-Tag: Release-2010-05/1~9453^2~3764
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af6454bb20d49aef0a8e6f055c27067f6ae180d6;p=openembedded.git

merge of d1b5c87dce377ea2c44f56b5dc50a30a516622d8
     and e98e2ade5d50176ea17a627451ff8d233ac9a4ef
---

af6454bb20d49aef0a8e6f055c27067f6ae180d6