From: Koen Kooi <koen@openembedded.org>
Date: Wed, 22 Mar 2006 20:53:08 +0000 (+0000)
Subject: merge of 4fa7f171e4ab9878ada3ea61bf2133d23760f203
X-Git-Tag: Release-2010-05/1~9453^2~2158
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bbb31f371886109d11fb60e05e235b65223d69d;p=openembedded.git

merge of 4fa7f171e4ab9878ada3ea61bf2133d23760f203
     and d5059d334780525ec675748a3862597b1e5c7c7a
---

7bbb31f371886109d11fb60e05e235b65223d69d