From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Mon, 31 Jul 2006 15:36:05 +0000 (+0000)
Subject: merge of 158d7fcc3d3ef86d360c775f912e5e314992018d
X-Git-Tag: Release-2010-05/1~9453^2~1037^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc67256da139ba348bfc5e98138da3d7e84c7f48;p=openembedded.git

merge of 158d7fcc3d3ef86d360c775f912e5e314992018d
     and bbd3a2811e13a3b99224c1a846af2a244d292c41
---

cc67256da139ba348bfc5e98138da3d7e84c7f48