From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 12 Dec 2006 12:24:17 +0000 (+0000)
Subject: merge of '19860068438a3f48413a2f40e4032ce5e8c1fe7d'
X-Git-Tag: Release-2010-05/1~9453^2~171^2~12^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ada8de47c0371621a7906edcc624556f21e785ee;p=openembedded.git

Merge ... '19860068438a3f48413a2f40e4032ce5e8c1fe7d'
     and 'a5b842809a85562e0154b206660598c3b851094c'
---

ada8de47c0371621a7906edcc624556f21e785ee