From: Koen Kooi <koen@openembedded.org>
Date: Sun, 6 Aug 2006 13:00:11 +0000 (+0000)
Subject: merge of '4dfc78edd77f8873f466310c5aeb329cb95eb08e'
X-Git-Tag: Release-2010-05/1~9453^2~999^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27900a482bcdafd387ed455e747fac95f8a74177;p=openembedded.git

Merge ... '4dfc78edd77f8873f466310c5aeb329cb95eb08e'
     and '59db0e08dee38b700ad535721bd778414bd8b07c'
---

27900a482bcdafd387ed455e747fac95f8a74177