From: Koen Kooi <koen@openembedded.org>
Date: Fri, 3 Mar 2006 17:00:45 +0000 (+0000)
Subject: merge of 4331fe84e383e44c80f5771143f3f2ab6f522c48
X-Git-Tag: Release-2010-05/1~9453^2~2295^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33bcbf5161fd0d6475e0ce44af3344b541d97d51;p=openembedded.git

merge of 4331fe84e383e44c80f5771143f3f2ab6f522c48
     and 78ec2de1cad3328aa990b529ccaa5d719f5efe7a
---

33bcbf5161fd0d6475e0ce44af3344b541d97d51