From: Koen Kooi <koen@openembedded.org>
Date: Fri, 11 Aug 2006 18:38:10 +0000 (+0000)
Subject: merge of '0d5d329305f1889da24316c8f1a1c4055aa1c965'
X-Git-Tag: Release-2010-05/1~9453^2~972^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf0084145f0d0dc19f26960f4c7b2c22760d0027;p=openembedded.git

Merge ... '0d5d329305f1889da24316c8f1a1c4055aa1c965'
     and 'a064ac2b5db052cbadae6856a18d5be4dd8ef6e9'
---

cf0084145f0d0dc19f26960f4c7b2c22760d0027