From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Fri, 7 Dec 2007 10:54:19 +0000 (+0000)
Subject: merge of '105955293719b2a1414f1b03af410b8ff8dbdb1b'
X-Git-Tag: Release-2010-05/1~8180^2~9^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c54cf4d8d24c3ba54ba315b4e8c591965a07468;p=openembedded.git

Merge ... '105955293719b2a1414f1b03af410b8ff8dbdb1b'
     and 'bbfafd074ae90979163ac23aa8963973c27e811d'
---

9c54cf4d8d24c3ba54ba315b4e8c591965a07468