From: Koen Kooi <koen@openembedded.org>
Date: Tue, 14 Aug 2007 11:34:53 +0000 (+0000)
Subject: merge of '0c14edad9fe9be01f3dcd8bb7481391246756938'
X-Git-Tag: Release-2010-05/1~8973
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c138f4a7131723db2a6c061eeafc13388f55bed;p=openembedded.git

Merge ... '0c14edad9fe9be01f3dcd8bb7481391246756938'
     and 'afa51d1bd3a6d0684595da996d34d4923676187f'
---

0c138f4a7131723db2a6c061eeafc13388f55bed