From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 30 May 2006 14:14:46 +0000 (+0000)
Subject: merge of 01f1ccec23eb7fc423ff878a513ff4a2aa0847b4
X-Git-Tag: Release-2010-05/1~9453^2~1558^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98ca1289c3a1619faf33b4d59857998810ad31e3;p=openembedded.git

merge of 01f1ccec23eb7fc423ff878a513ff4a2aa0847b4
     and 1ebed2257b095d2f7f67acd91f0979bd1f8c79a9
---

98ca1289c3a1619faf33b4d59857998810ad31e3