From: Koen Kooi <koen@openembedded.org>
Date: Mon, 18 Jul 2005 22:22:11 +0000 (+0000)
Subject: merge of 0415e9a2076e6c6342016b64c577a71db1c9d5d0
X-Git-Tag: Release-2010-05/1~9453^2~4129^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=488c94400553be4e7bf946430a4783ee7e91f38b;p=openembedded.git

merge of 0415e9a2076e6c6342016b64c577a71db1c9d5d0
     and 0c0e42d7342579eb1ee491a6b8a0a8610fe644c5
---

488c94400553be4e7bf946430a4783ee7e91f38b