From: Koen Kooi <koen@openembedded.org>
Date: Mon, 3 Dec 2007 12:15:18 +0000 (+0000)
Subject: merge of '2a763ba11cf69b342a356812987f63bb2053011b'
X-Git-Tag: Release-2010-05/1~8236^2~7^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d9e9a839d6a35ef75cb10224302c860f0ef4309;p=openembedded.git

Merge ... '2a763ba11cf69b342a356812987f63bb2053011b'
     and '4ca56810304293da744170c82e50552f5dcf084f'
---

0d9e9a839d6a35ef75cb10224302c860f0ef4309