From: Koen Kooi <koen@openembedded.org>
Date: Wed, 23 Aug 2006 11:20:01 +0000 (+0000)
Subject: merge of '2098d6e0cf6da177c9c29ab698039d0012c237cf'
X-Git-Tag: Release-2010-05/1~9453^2~911^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74a78deba9f6f4b6f64d61b3bc54d9d347123f2d;p=openembedded.git

Merge ... '2098d6e0cf6da177c9c29ab698039d0012c237cf'
     and 'ba1e4402b3fca3d076d401b99e8e14999910d0e5'
---

74a78deba9f6f4b6f64d61b3bc54d9d347123f2d