From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Wed, 9 May 2007 22:08:30 +0000 (+0000)
Subject: merge of '2baf3a1fbd62929bb0545e9e479b7a34b21190a2'
X-Git-Tag: Release-2010-05/1~8868^2~565^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8805a80d179564eaaf4e3c40a10c7b4a63efcbee;p=openembedded.git

Merge ... '2baf3a1fbd62929bb0545e9e479b7a34b21190a2'
     and '7ce8482617dacb21bddaed0ba9c8a445bbf9dfdf'
---

8805a80d179564eaaf4e3c40a10c7b4a63efcbee