From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 15 Nov 2005 17:39:25 +0000 (+0000)
Subject: merge of 5df1387cd8c625374e63d4615c0507cf6c6a45c0
X-Git-Tag: Release-2010-05/1~9453^2~3075
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6cb11d26ea5ee3cb9f6b4b43d7fbb304f4ab290;p=openembedded.git

merge of 5df1387cd8c625374e63d4615c0507cf6c6a45c0
     and 8a31a000a664d200e8aaa578c071fb1bf2664eb2
---

f6cb11d26ea5ee3cb9f6b4b43d7fbb304f4ab290