From: Koen Kooi <koen@openembedded.org>
Date: Tue, 2 Jan 2007 19:39:48 +0000 (+0000)
Subject: merge of '2cb5af15b69e039f3a37629ca3a637b05cae7138'
X-Git-Tag: Release-2010-05/1~9453^2~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26923fcad450090e65e0fca74a0532fbea3ae458;p=openembedded.git

Merge ... '2cb5af15b69e039f3a37629ca3a637b05cae7138'
     and '8571d11847894fe4e419cfb25c5ae5accc13e3aa'
---

26923fcad450090e65e0fca74a0532fbea3ae458