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

Merge ... '0d687ebf73328d86c69750e15499ae073b7b80f6'
     and '105955293719b2a1414f1b03af410b8ff8dbdb1b'
---

f6f1c6eb5b792b0face12ad3b4d2e0bea0b65946