From: Koen Kooi <koen@openembedded.org>
Date: Fri, 2 Mar 2007 16:46:08 +0000 (+0000)
Subject: merge of '69edd2665ebcc2300e8bc7e99639c741befd2ec0'
X-Git-Tag: Release-2010-05/1~9112
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2434e5ad46a1e210328cdcc85e3c495de7620f05;p=openembedded.git

Merge ... '69edd2665ebcc2300e8bc7e99639c741befd2ec0'
     and 'ecf409702bbbc60edfa91a94b9437b9c1f04fc25'
---

2434e5ad46a1e210328cdcc85e3c495de7620f05