From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 14 Mar 2007 03:52:57 +0000 (+0000)
Subject: merge of '8f2faed526c135c5bf4913b322ad0cd349505c22'
X-Git-Tag: Release-2010-05/1~8868^2~1092^2~1^2~3^2~7^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c131d0c4529aba90ba185a43ebaa02ae1db83e0;p=openembedded.git

Merge ... '8f2faed526c135c5bf4913b322ad0cd349505c22'
     and 'cc93779f06baa487b5fd2c375007139a847b0bd6'
---

4c131d0c4529aba90ba185a43ebaa02ae1db83e0