From: Koen Kooi <koen@openembedded.org>
Date: Thu, 29 Mar 2007 11:50:53 +0000 (+0000)
Subject: merge of '0530cbc2e708bd334c3cfce29e493b23ac334eae'
X-Git-Tag: Release-2010-05/1~8868^2~928^2~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59fda25ab6c5091f0f4fd462f54a4555d5f9faf1;p=openembedded.git

Merge ... '0530cbc2e708bd334c3cfce29e493b23ac334eae'
     and 'b29c23e0d633fa6ee3a025145df31e696fcc3cd3'
---

59fda25ab6c5091f0f4fd462f54a4555d5f9faf1