From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Sat, 1 Dec 2007 10:42:17 +0000 (+0000)
Subject: merge of '2683bd9d4ce3415de6e02aa18e8e6f4ee7fbfb5a'
X-Git-Tag: Release-2010-05/1~8252
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19c5b1c558152f0720046d98ec65cc1b4aa98a68;p=openembedded.git

Merge ... '2683bd9d4ce3415de6e02aa18e8e6f4ee7fbfb5a'
     and 'bee176e62f09ed2869211e26933a49bb485a2b2b'
---

19c5b1c558152f0720046d98ec65cc1b4aa98a68