From: Koen Kooi <koen@openembedded.org>
Date: Tue, 1 Apr 2008 10:30:35 +0000 (+0000)
Subject: merge of '3a476b00537a64a6add8bd114705a5f82eb6eef4'
X-Git-Tag: Release-2010-05/1~7249^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9610a64465aa531182bd742996f37ae8414e678;p=openembedded.git

Merge ... '3a476b00537a64a6add8bd114705a5f82eb6eef4'
     and 'a969c8d5435c04a5d12f8d650d864e12384c7c28'
---

e9610a64465aa531182bd742996f37ae8414e678