From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 20 Feb 2006 10:50:46 +0000 (+0000)
Subject: merge of 1b17d5ea0903d185ff79427f6672db4ae5d2bb71
X-Git-Tag: Release-2010-05/1~9453^2~2311
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb16ee90c7dfc0cdfd1cd29507467edf3a5be32d;p=openembedded.git

merge of 1b17d5ea0903d185ff79427f6672db4ae5d2bb71
     and eb1daf075f0b4e388a5f746d0c17cef007acb4aa
---

bb16ee90c7dfc0cdfd1cd29507467edf3a5be32d