From: Koen Kooi <koen@openembedded.org>
Date: Thu, 9 Nov 2006 13:36:16 +0000 (+0000)
Subject: merge of '6af5be50367621ab5838c9f4dc4e831a81c1d225'
X-Git-Tag: Release-2010-05/1~9453^2~481^2~3^2~38
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=341eb35a43af8d2240d8118851f0cc1bb6145b36;p=openembedded.git

Merge ... '6af5be50367621ab5838c9f4dc4e831a81c1d225'
     and 'fa302963f7d41e6cdf3efbde3458b3731e8ec5ae'
---

341eb35a43af8d2240d8118851f0cc1bb6145b36