From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 18 Dec 2006 08:47:09 +0000 (+0000)
Subject: merge of 1d23208dad03f6c188e1bf6014c8cd0526eaea49
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2^2~1^2^2^2^2~6^2~2^2~2^2~1^2~1^2~1^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6519d48e90022613949fb79b0e82ce3e342caac;p=openembedded.git

merge of 1d23208dad03f6c188e1bf6014c8cd0526eaea49
     and bf389a6e16fb95ecee8122f63f13c6f7c1ff7d32
---

f6519d48e90022613949fb79b0e82ce3e342caac