From: Koen Kooi <koen@openembedded.org>
Date: Thu, 14 Sep 2006 21:14:12 +0000 (+0000)
Subject: merge of 'a1d864e39820a6d83791681ce836e11ac38a89b6'
X-Git-Tag: Release-2010-05/1~9453^2~802^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=189eeba1948c7e4def33a113ceffdeb4f5567e1f;p=openembedded.git

Merge ... 'a1d864e39820a6d83791681ce836e11ac38a89b6'
     and 'db2f843f48cece5e25cf2e654db269ba3dba5192'
---

189eeba1948c7e4def33a113ceffdeb4f5567e1f