From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 18 Dec 2006 21:33:31 +0000 (+0000)
Subject: merge of 8a20067d752933aff6ff7c7f2211a1631e5fe204
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=872ebe9dbee6f1d20b0a882abbaf365b3b19fd7a;p=openembedded.git

merge of 8a20067d752933aff6ff7c7f2211a1631e5fe204
     and a74be6917766e52432e5a568c76b7232f0cb0cda
---

872ebe9dbee6f1d20b0a882abbaf365b3b19fd7a