From: Koen Kooi <koen@openembedded.org>
Date: Wed, 18 Oct 2006 08:49:53 +0000 (+0000)
Subject: merge of '91e857f4e4f0139bbea26d8f79434e22885acf30'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~112
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f680f934863dd0f4f673cf2f54efd61ccb40c270;p=openembedded.git

Merge ... '91e857f4e4f0139bbea26d8f79434e22885acf30'
     and 'c4b26d4a928a1fca0cf7295a0c9ce96e4e9d04ba'
---

f680f934863dd0f4f673cf2f54efd61ccb40c270