From: Koen Kooi <koen@openembedded.org>
Date: Tue, 20 Dec 2005 16:31:46 +0000 (+0000)
Subject: merge of 0b9d1fff00de0e6e3607281ba24e99cc229cda94
X-Git-Tag: Release-2010-05/1~9453^2~2876
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dad684d8f6b68397817fbd4d4990699cbc33d3ad;p=openembedded.git

merge of 0b9d1fff00de0e6e3607281ba24e99cc229cda94
     and a762683ec16bf4a36932c939cfa45b55ea5dfff1
---

dad684d8f6b68397817fbd4d4990699cbc33d3ad