From: Koen Kooi <koen@openembedded.org>
Date: Thu, 18 May 2006 14:08:12 +0000 (+0000)
Subject: merge of 93a7ad23db8afae5e3440a5866caf7bf2f8ee416
X-Git-Tag: Release-2010-05/1~9453^2~1681^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7de629c98ed2ff64d21e3faeaddf9086b06b452e;p=openembedded.git

merge of 93a7ad23db8afae5e3440a5866caf7bf2f8ee416
     and e2cc7febcaa769d78c69fc489e6318305e12313d
---

7de629c98ed2ff64d21e3faeaddf9086b06b452e