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

merge of 40541144c923b30f6cbeec9ac83513dbe048d29a
     and 51a08f420d11f23c3beb1acc0c022582d5306d03
---

fbeaf1e8b987f11c902e95b5f3f904d015c0b140