From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 14 Nov 2006 09:53:43 +0000 (+0000)
Subject: merge of '9a82479a1b0af8251aa5c6ea7914cc89f3029f71'
X-Git-Tag: Release-2010-05/1~9453^2~513^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ef8131669a423c69d617cfd9dc769129a340b36;p=openembedded.git

Merge ... '9a82479a1b0af8251aa5c6ea7914cc89f3029f71'
     and 'fe0bd7228d1ed03f85cd983d04ad840cc2a6c538'
---

1ef8131669a423c69d617cfd9dc769129a340b36