From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Wed, 30 Apr 2008 12:15:56 +0000 (+0000)
Subject: merge of '1f1207adefc2b440a93c771a15e7c5aab26497a4'
X-Git-Tag: Release-2010-05/1~7079^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f998beaf3bcb18f1bd28b8e46a9c401caf309fa6;p=openembedded.git

Merge ... '1f1207adefc2b440a93c771a15e7c5aab26497a4'
     and '5b1c73beb325cedc73f912683595bfe31eac6f31'
---

f998beaf3bcb18f1bd28b8e46a9c401caf309fa6