From: Mike Westerhof <mwester@dls.net>
Date: Thu, 4 Jan 2007 06:27:09 +0000 (+0000)
Subject: merge of '521ac5658b53e3b348b3e85852c99f684ac9e8d3'
X-Git-Tag: Release-2010-05/1~9453^2~29
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=929c1e08c7b22d2a621c9de8867f8ddf4633cb5a;p=openembedded.git

Merge ... '521ac5658b53e3b348b3e85852c99f684ac9e8d3'
     and 'ca40d35221cc8bdac2ca608b0449df2559183f6a'
---

929c1e08c7b22d2a621c9de8867f8ddf4633cb5a