From: Koen Kooi <koen@openembedded.org>
Date: Fri, 7 Dec 2007 11:18:18 +0000 (+0000)
Subject: merge of '34022eff29a839f8a6463586208fafbffd94e083'
X-Git-Tag: Release-2010-05/1~8180^2~9^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a563442195a2bdc36911cb173890dbd209895aa;p=openembedded.git

Merge ... '34022eff29a839f8a6463586208fafbffd94e083'
     and '7444d12b1f1d463507de1ebfd203527718c89cfa'
---

5a563442195a2bdc36911cb173890dbd209895aa