From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 21 Jun 2006 10:16:24 +0000 (+0000)
Subject: merge of c5acd74e482d1e7de50bea58a79d8784225f2e5e
X-Git-Tag: Release-2010-05/1~9453^2~1429^2~15^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c42d24b5fa03ee99ee73030dd09e93d6dd1eb14a;p=openembedded.git

merge of c5acd74e482d1e7de50bea58a79d8784225f2e5e
     and f44ffed4d1c961106d82ea95f9bb41d70cd60e66
---

c42d24b5fa03ee99ee73030dd09e93d6dd1eb14a