From: Koen Kooi <koen@openembedded.org>
Date: Tue, 2 Oct 2007 09:40:27 +0000 (+0000)
Subject: merge of '35958473cb3e7c22ae3b948f47dcd57d676d22a0'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~128^2~11^2~28^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2829956ca475be64def70baa8e50333e0737bac4;p=openembedded.git

Merge ... '35958473cb3e7c22ae3b948f47dcd57d676d22a0'
     and 'dd9786d58f303cdd2d0ff136859e41e1b6558b66'
---

2829956ca475be64def70baa8e50333e0737bac4