From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 25 Nov 2005 16:11:46 +0000 (+0000)
Subject: merge of c556b666e701d000fdce92e12dd4e6d8dd6dadac
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e95e5c53b37690efacf380f26a76e8749d55ab6e;p=openembedded.git

merge of c556b666e701d000fdce92e12dd4e6d8dd6dadac
     and dac65a99f38ac6da3e7c8ece44938ffd7aad88c4
---

e95e5c53b37690efacf380f26a76e8749d55ab6e