From: Koen Kooi <koen@openembedded.org>
Date: Tue, 27 Jun 2006 10:22:56 +0000 (+0000)
Subject: merge of 6c8af3e5626e2962745d40f48121c1f325288cda
X-Git-Tag: Release-2010-05/1~9453^2~1418
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb11932e449e33336708e77b615817a21325e812;p=openembedded.git

merge of 6c8af3e5626e2962745d40f48121c1f325288cda
     and d5cd44e4415b52831c79b2b82d546c0ba8c24528
---

cb11932e449e33336708e77b615817a21325e812