From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 12 Nov 2005 08:00:15 +0000 (+0000)
Subject: merge of 14567c9c4abe3eb73c714bca33a8ecdcf37a5f93
X-Git-Tag: Release-2010-05/1~9453^2~3097
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ede4e38cb897f8325758df06d4ca55a6e56d6bd;p=openembedded.git

merge of 14567c9c4abe3eb73c714bca33a8ecdcf37a5f93
     and 2fa748703e56caa7448653fa64a00952d5796474
---

1ede4e38cb897f8325758df06d4ca55a6e56d6bd