From: Jan Lübbe <jluebbe@debian.org>
Date: Sun, 7 Oct 2007 16:28:48 +0000 (+0000)
Subject: merge of '6290a5cbe0263dc9f36d8173dc82cfd5253fcba4'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~124^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04cf1e3746b45227badc349752dafeaee74d4567;p=openembedded.git

Merge ... '6290a5cbe0263dc9f36d8173dc82cfd5253fcba4'
     and 'f932fa3f7eccd6af6a193dce671ebe48f0d075ff'
---

04cf1e3746b45227badc349752dafeaee74d4567