From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 18 Dec 2006 22:32:36 +0000 (+0000)
Subject: merge of 227034a2bac24a3c6bb43b7e5baa72788c669bfa
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~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=346f96e2e191bfd83a61a38d75fa9751dfc92f77;p=openembedded.git

merge of 227034a2bac24a3c6bb43b7e5baa72788c669bfa
     and ad9ccc1e52b486fd09144f4ef41a8f7fea1d33f4
---

346f96e2e191bfd83a61a38d75fa9751dfc92f77