From: Jan Lübbe <jluebbe@debian.org>
Date: Thu, 3 Jan 2008 15:48:31 +0000 (+0000)
Subject: merge of '128beb53ed0092647984a87f2a86eaec9d1f3510'
X-Git-Tag: Release-2010-05/1~8032
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6add5fe0f052e3f9e42036c4c30df7b45225900;p=openembedded.git

Merge ... '128beb53ed0092647984a87f2a86eaec9d1f3510'
     and '2a1403c40d81aff7aa7bbe8236c502336c5b9a09'
---

f6add5fe0f052e3f9e42036c4c30df7b45225900