From: Koen Kooi <koen@openembedded.org>
Date: Sun, 18 Nov 2007 10:41:20 +0000 (+0000)
Subject: merge of '5218b291289ff56a8d3f0caa1ddf13f84dfe516f'
X-Git-Tag: Release-2010-05/1~8351
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08ecde71ca7eae9a678363c357807a50fe71fe23;p=openembedded.git

Merge ... '5218b291289ff56a8d3f0caa1ddf13f84dfe516f'
     and '8e25ce126ed9c9216d456d96f115eadd784f8157'
---

08ecde71ca7eae9a678363c357807a50fe71fe23