From: Koen Kooi <koen@openembedded.org>
Date: Mon, 12 Mar 2007 20:24:12 +0000 (+0000)
Subject: merge of '22707d4a2732d846be50633b33777233881d2761'
X-Git-Tag: Release-2010-05/1~8868^2~1092^2~1^2~7^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=925e5796e12d9a70da5fbaddc6fddfa1cd644f56;p=openembedded.git

Merge ... '22707d4a2732d846be50633b33777233881d2761'
     and 'cc36c0fcd3ef4d293e42c2d04104ccaeb774fc1f'
---

925e5796e12d9a70da5fbaddc6fddfa1cd644f56