From: Koen Kooi <koen@openembedded.org>
Date: Thu, 21 Jul 2005 23:52:53 +0000 (+0000)
Subject: merge of 4fe4838753ca7f23c9801afa9ecc94acdb3f3e2f
X-Git-Tag: Release-2010-05/1~9453^2~4086^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70a456d4bce1993048edd449e92b0aaa2535784d;p=openembedded.git

merge of 4fe4838753ca7f23c9801afa9ecc94acdb3f3e2f
     and c5b641f12e4ed0db849b6c4b6b75b5babd603514
---

70a456d4bce1993048edd449e92b0aaa2535784d