From: Koen Kooi <koen@openembedded.org>
Date: Wed, 6 Jun 2007 15:12:59 +0000 (+0000)
Subject: merge of '30e6927f64df64a690f6fa71e96e620cbf201274'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~72^2~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a12507bbf13e1a25bbecede41a9258bae3cb814;p=openembedded.git

Merge ... '30e6927f64df64a690f6fa71e96e620cbf201274'
     and 'e6bd0dc9230ea6acdcf964b4cbbe2d204eb2a5c6'
---

9a12507bbf13e1a25bbecede41a9258bae3cb814