From: Koen Kooi <koen@openembedded.org>
Date: Wed, 10 Aug 2005 17:00:41 +0000 (+0000)
Subject: merge of 0cac7f8ff05ffed52b7fd8c45edd92ac63c50786
X-Git-Tag: Release-2010-05/1~9453^2~3920^2~15
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da2d1d094813cd5fd15bca26c1ede82db4d0e0ce;p=openembedded.git

merge of 0cac7f8ff05ffed52b7fd8c45edd92ac63c50786
     and 8746aa49b2d44b03e77f44c96aaab655c6477034
---

da2d1d094813cd5fd15bca26c1ede82db4d0e0ce