From: Koen Kooi <koen@openembedded.org>
Date: Sun, 21 May 2006 20:20:56 +0000 (+0000)
Subject: merge of 213055f44fbb065f13acbde0cf78285357fa5b17
X-Git-Tag: Release-2010-05/1~9453^2~1654^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94a4513ecc9f30de777ae048ab2838fb15338e5d;p=openembedded.git

merge of 213055f44fbb065f13acbde0cf78285357fa5b17
     and 48bf49548c49f23c0829416516d9a654545ea89e
---

94a4513ecc9f30de777ae048ab2838fb15338e5d