From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 5 Dec 2005 13:52:56 +0000 (+0000)
Subject: merge of adb05dcda79a04e8d0e9cb1eb7976a9fa2c3d31e
X-Git-Tag: Release-2010-05/1~9453^2~2967^2~3^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56e3cfd5bc911e4e47ae00c8bafb785d48b0b7c5;p=openembedded.git

merge of adb05dcda79a04e8d0e9cb1eb7976a9fa2c3d31e
     and d510fe2c093aff12bc3223326057244c800701ad
---

56e3cfd5bc911e4e47ae00c8bafb785d48b0b7c5