From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 9 Jun 2006 11:54:49 +0000 (+0000)
Subject: merge of 8815d4967f1262fca1f006c351c0008752d95abe
X-Git-Tag: Release-2010-05/1~9453^2~1481
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e0781dec8f09397329a0c4b7debb687756bdc7d;p=openembedded.git

merge of 8815d4967f1262fca1f006c351c0008752d95abe
     and ece612fcca7a1acdc247d093de2de16137463bae
---

7e0781dec8f09397329a0c4b7debb687756bdc7d