From: Koen Kooi <koen@openembedded.org>
Date: Tue, 2 Oct 2007 08:45:48 +0000 (+0000)
Subject: merge of '34d07eb5a0a81538143c57486cc515538a4d97ea'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~128^2~11^2~28^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebcb748ed5646052cdd89c14ea09b5ba3768d178;p=openembedded.git

Merge ... '34d07eb5a0a81538143c57486cc515538a4d97ea'
     and 'cccbcdee9adebcb074bf6947b2a127fec3260453'
---

ebcb748ed5646052cdd89c14ea09b5ba3768d178