From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 16 Jan 2006 16:17:25 +0000 (+0000)
Subject: merge of 36b037a423c8b35b017dc3b821094d570ea82d5a
X-Git-Tag: Release-2010-05/1~9453^2~2640
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f42a176f495c794db2958d008ca3016f96e16963;p=openembedded.git

merge of 36b037a423c8b35b017dc3b821094d570ea82d5a
     and fa2f4d331a36d371e62aa55ceccfe3ec1383bf08
---

f42a176f495c794db2958d008ca3016f96e16963