From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 4 Oct 2006 11:27:11 +0000 (+0000)
Subject: merge of '520c4478756706e455646c210bc2cd1c7df9e2f6'
X-Git-Tag: Release-2010-05/1~9453^2~615^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f6ee6ed0657f385c5a5357728387db34449344f;p=openembedded.git

Merge ... '520c4478756706e455646c210bc2cd1c7df9e2f6'
     and 'ce640ed0373acabc788ee1eb2ecd97c7f980dff5'
---

2f6ee6ed0657f385c5a5357728387db34449344f