From: Koen Kooi <koen@openembedded.org>
Date: Sat, 26 Aug 2006 21:18:29 +0000 (+0000)
Subject: merge of 'bf8790b0b16ee7e79a7ef29a775d55ffeabcb9a2'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~59^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdc1540fc3663a231dcc22bc9b95dc94473bd817;p=openembedded.git

Merge ... 'bf8790b0b16ee7e79a7ef29a775d55ffeabcb9a2'
     and 'e756d424cb3aac14f24822fd1d4481b5dc2fa8fd'
---

cdc1540fc3663a231dcc22bc9b95dc94473bd817