From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 1 Jan 2007 12:47:12 +0000 (+0000)
Subject: merge of 9283ad401412a7de1e13fc4899546b7284a153b5
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9af59c1937e9a14e911cbd9cd3ce26c11afe72b;p=openembedded.git

merge of 9283ad401412a7de1e13fc4899546b7284a153b5
     and a2bc17f339e13b200d5648353907d765b53353d5
---

d9af59c1937e9a14e911cbd9cd3ce26c11afe72b