From: Koen Kooi <koen@openembedded.org>
Date: Fri, 7 Oct 2005 20:35:29 +0000 (+0000)
Subject: merge of 4ba84c5c9cdff518f67f0beabbc85ba4888d789c
X-Git-Tag: Release-2010-05/1~9453^2~3320
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc4e37d7a27ac12d391289f7f5b42a5124325750;p=openembedded.git

merge of 4ba84c5c9cdff518f67f0beabbc85ba4888d789c
     and 5e19733decfc6d866375641949b24b63dd5b2a3e
---

dc4e37d7a27ac12d391289f7f5b42a5124325750