From: Koen Kooi <koen@openembedded.org>
Date: Mon, 10 Jul 2006 09:16:37 +0000 (+0000)
Subject: merge of 210506ba1cbb231216c4c537654bc61f30cdd6d5
X-Git-Tag: Release-2010-05/1~9453^2~1269
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2eb3e3f4480fbca0d7f634db06d9fa726f0ccd55;p=openembedded.git

merge of 210506ba1cbb231216c4c537654bc61f30cdd6d5
     and 41c57842bfc16f4853d0f673eb4db65930ec7085
---

2eb3e3f4480fbca0d7f634db06d9fa726f0ccd55