From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Dec 2007 11:24:38 +0000 (+0000)
Subject: merge of '8c692ec4078a7d2e345213289da925bfca3cac63'
X-Git-Tag: Release-2010-05/1~8232^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2ec10e5520b850581a6979eb138be41bc6d277d;p=openembedded.git

Merge ... '8c692ec4078a7d2e345213289da925bfca3cac63'
     and 'bee606bba2fcf2659a8e2c29fbbc9d904f84962c'
---

c2ec10e5520b850581a6979eb138be41bc6d277d