From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 10 Aug 2006 13:42:36 +0000 (+0000)
Subject: merge of '10c21bb238539618dce6821f24ff93b05a7abd6b'
X-Git-Tag: Release-2010-05/1~9453^2~996^2~1^2^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee9f43c21951851f7bdd46b412167b8a85353a21;p=openembedded.git

Merge ... '10c21bb238539618dce6821f24ff93b05a7abd6b'
     and 'e159af24ff18ed3b55b092ed9b90e7e60221c899'
---

ee9f43c21951851f7bdd46b412167b8a85353a21