From: Koen Kooi <koen@openembedded.org>
Date: Fri, 12 May 2006 07:11:30 +0000 (+0000)
Subject: merge of 1f12dbd1bf0fd30504f661a5c169a9551e06202b
X-Git-Tag: Release-2010-05/1~9453^2~1712
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a3b4601135f158d70f14e12d2b27107ab895f14;p=openembedded.git

merge of 1f12dbd1bf0fd30504f661a5c169a9551e06202b
     and 4ee0eea0ff207e681c6c5b09e879932e2a91b42b
---

3a3b4601135f158d70f14e12d2b27107ab895f14