From: Koen Kooi <koen@openembedded.org>
Date: Sat, 6 Sep 2008 10:20:07 +0000 (+0000)
Subject: merge of '02d2a2fcfe802bc2a50b32abb39c188461f83cc8'
X-Git-Tag: Release-2010-05/1~6141^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e31efe925d781e9fe82f358158e2f1bc4e44ec30;p=openembedded.git

Merge ... '02d2a2fcfe802bc2a50b32abb39c188461f83cc8'
     and 'a83dd390e6cc7d972407dc06660f6b890764d341'
---

e31efe925d781e9fe82f358158e2f1bc4e44ec30