From: Koen Kooi <koen@openembedded.org>
Date: Tue, 25 Apr 2006 10:24:10 +0000 (+0000)
Subject: merge of 2e72ff814146cd6f8905742854f09312f89f7f5e
X-Git-Tag: Release-2010-05/1~9453^2~1898^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e8e64d9713add649f254706e3da09ef4c235993;p=openembedded.git

merge of 2e72ff814146cd6f8905742854f09312f89f7f5e
     and 7bea148102c0724aff0e6a3c580de23677685c48
---

9e8e64d9713add649f254706e3da09ef4c235993