From: Koen Kooi <koen@openembedded.org>
Date: Wed, 25 Jul 2007 15:20:22 +0000 (+0000)
Subject: merge of '16117855ab79f990564455eee9d420e472e6ab44'
X-Git-Tag: Release-2010-05/1~8868^2~88^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2da13ebbe1c7ddae7c77364217bb1cbaddb8fba7;p=openembedded.git

Merge ... '16117855ab79f990564455eee9d420e472e6ab44'
     and 'a4e4bdd6c9f1532c72e89559a85e2a3c12d161b5'
---

2da13ebbe1c7ddae7c77364217bb1cbaddb8fba7