From: Koen Kooi <koen@openembedded.org>
Date: Tue, 16 May 2006 11:50:15 +0000 (+0000)
Subject: merge of fe620b82f3ed9b9828a78908bfe73a5c27ccc59d
X-Git-Tag: Release-2010-05/1~9453^2~1692^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=807691a38f65b92267342db8ba4feac9b35d5758;p=openembedded.git

merge of fe620b82f3ed9b9828a78908bfe73a5c27ccc59d
     and e84b72e0b67ac92d81d1f7a72737dd8286340e5d
---

807691a38f65b92267342db8ba4feac9b35d5758