From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 20 May 2007 09:01:06 +0000 (+0000)
Subject: merge of '56dd632a3a9de2d8f4b9d335e96a43648c9cd3bd'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2^2~1^2~2^2^2~2^2^2~6^2^2~1^2~1^2^2~1^2^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19c63c7672c725d741d28bdf83dcfd573567ab8d;p=openembedded.git

Merge ... '56dd632a3a9de2d8f4b9d335e96a43648c9cd3bd'
     and '866337340e294f0d9e894aedc0116eb1d80f677f'
---

19c63c7672c725d741d28bdf83dcfd573567ab8d