From: Koen Kooi <koen@openembedded.org>
Date: Thu, 11 May 2006 16:52:09 +0000 (+0000)
Subject: merge of 315a43a2834c10ffcb7b5641f22459f878a47297
X-Git-Tag: Release-2010-05/1~9453^2~1719
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42a161da4b4609b4b29d4b249f23d2b799596716;p=openembedded.git

merge of 315a43a2834c10ffcb7b5641f22459f878a47297
     and cdafdfea115bd337ea8b144f31e6951f530615d2
---

42a161da4b4609b4b29d4b249f23d2b799596716