From: Koen Kooi <koen@openembedded.org>
Date: Wed, 30 May 2007 10:14:28 +0000 (+0000)
Subject: merge of '004380a4e5b2e3e1156fd497174eb001676bbc8a'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~145^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a92b89f74247ccbfb54ec50f9a6ea6cb055d37b;p=openembedded.git

Merge ... '004380a4e5b2e3e1156fd497174eb001676bbc8a'
     and '134a95998779b68fe6328f19f104e5e83a05e716'
---

5a92b89f74247ccbfb54ec50f9a6ea6cb055d37b