From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 18 Dec 2006 04:17:11 +0000 (+0000)
Subject: merge of 3ac330820233241a6172582d14575cac86a958fa
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^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bd873a62aa9a81c19abf8873bc546b2ec596f84;p=openembedded.git

merge of 3ac330820233241a6172582d14575cac86a958fa
     and 99a30a086b023b4afadccea9b001f5355c7d21eb
---

5bd873a62aa9a81c19abf8873bc546b2ec596f84