From: Koen Kooi <koen@openembedded.org>
Date: Thu, 21 Jul 2005 21:38:28 +0000 (+0000)
Subject: merge of 6da21d0d95b412989c3883c587af4931afea6741
X-Git-Tag: Release-2010-05/1~9453^2~4092^2~6^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2167bc60b5196f9172fc95bbf99f89bc57b73189;p=openembedded.git

merge of 6da21d0d95b412989c3883c587af4931afea6741
     and d23fa20efa477539bb55a99c02a96896167f1c2b
---

2167bc60b5196f9172fc95bbf99f89bc57b73189