From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Tue, 4 Dec 2007 11:26:50 +0000 (+0000)
Subject: merge of '20415869e4deffc3f561d06a10ea4e95d8d13db7'
X-Git-Tag: Release-2010-05/1~8180^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2bbf4ace892d7f32933ca26f1f2b320fc0bcb99;p=openembedded.git

Merge ... '20415869e4deffc3f561d06a10ea4e95d8d13db7'
     and 'bee606bba2fcf2659a8e2c29fbbc9d904f84962c'
---

d2bbf4ace892d7f32933ca26f1f2b320fc0bcb99