From: Koen Kooi <koen@openembedded.org>
Date: Sat, 2 Sep 2006 11:32:06 +0000 (+0000)
Subject: merge of '0f5fc910a03052e7b935c22cf24e1235f9cc1576'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~82
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e3eb5b4d53e2adef9dfcc0d603935bba65caee8;p=openembedded.git

Merge ... '0f5fc910a03052e7b935c22cf24e1235f9cc1576'
     and '7881a5c74b4a349705d81ae3d969459001a9e1da'
---

2e3eb5b4d53e2adef9dfcc0d603935bba65caee8