From: Koen Kooi <koen@openembedded.org>
Date: Mon, 26 Jun 2006 17:29:25 +0000 (+0000)
Subject: merge of 401e5a3d3886286d5d38029666c6ac415b7be733
X-Git-Tag: Release-2010-05/1~9453^2~1421
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4b57f6055548781d4a8eb5bfbc2dec9830e7b1f;p=openembedded.git

merge of 401e5a3d3886286d5d38029666c6ac415b7be733
     and 579cd260bbdc718a32d629b94fbece89881341a8
---

f4b57f6055548781d4a8eb5bfbc2dec9830e7b1f