From: Koen Kooi <koen@openembedded.org>
Date: Wed, 27 Sep 2006 13:52:52 +0000 (+0000)
Subject: merge of '5a91122748a2eff5f19fc8d9fdd0d6d0b748f3d8'
X-Git-Tag: Release-2010-05/1~9453^2~677^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7171e115d170392689aeb662c5c4381b3275f69d;p=openembedded.git

Merge ... '5a91122748a2eff5f19fc8d9fdd0d6d0b748f3d8'
     and 'c594e84e99724db9f4ac0766c2e20018944b0ebe'
---

7171e115d170392689aeb662c5c4381b3275f69d