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

Merge ... 'f008d20c2f42a8ed304a2a4c0b2700ae8e876337'
     and 'f0e88c30b5c489ac8bb8d4a2f7914616a7a4db2f'
---

13c824995ed47475b186d62f99146eef4a1d29f2