From: Koen Kooi <koen@openembedded.org>
Date: Thu, 16 Nov 2006 23:31:39 +0000 (+0000)
Subject: merge of '61f51adb910c35364a495ee3a926fea53aad7b57'
X-Git-Tag: Release-2010-05/1~9453^2~434^2~30^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21f108d8a57a33a9e3742aecfac549994f868845;p=openembedded.git

Merge ... '61f51adb910c35364a495ee3a926fea53aad7b57'
     and 'd843059235f472ce11d08dbb0b2d70c8f9de243b'
---

21f108d8a57a33a9e3742aecfac549994f868845