From: Koen Kooi <koen@openembedded.org>
Date: Fri, 28 Jul 2006 07:49:46 +0000 (+0000)
Subject: merge of 'cf1a08098edb7df94073a8189329602a04381206'
X-Git-Tag: Release-2010-05/1~9453^2~1076
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac34fac42763eee1a8f39619c21700bcac0a0e9e;p=openembedded.git

Merge ... 'cf1a08098edb7df94073a8189329602a04381206'
     and 'f43951bf0f4ebd5ecbec9b661205593b8837d3eb'
---

ac34fac42763eee1a8f39619c21700bcac0a0e9e