From: Koen Kooi <koen@openembedded.org>
Date: Tue, 24 Jul 2007 18:44:33 +0000 (+0000)
Subject: merge of '332a00dc550ca182177c40331ae4e05ba59793e0'
X-Git-Tag: Release-2010-05/1~8868^2~88^2~13^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87bced1204d1fb7bcca24472722af24f498b18b1;p=openembedded.git

Merge ... '332a00dc550ca182177c40331ae4e05ba59793e0'
     and 'aa744207a479e8c8226e2ab5eceab4897c4cd863'
---

87bced1204d1fb7bcca24472722af24f498b18b1