From: Koen Kooi <koen@openembedded.org>
Date: Thu, 21 Jul 2005 21:29:41 +0000 (+0000)
Subject: merge of 3e6fa3a7826f139009a84b5f7f5a8ad4798c8b88
X-Git-Tag: Release-2010-05/1~9453^2~4092^2~5^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d1dc55f6d1d02a283c152e26da59e9a99a0ec1e;p=openembedded.git

merge of 3e6fa3a7826f139009a84b5f7f5a8ad4798c8b88
     and a7ddc196fe367bfa8b749b05d35d405dda04c436
---

7d1dc55f6d1d02a283c152e26da59e9a99a0ec1e