From: Jan Lübbe <jluebbe@debian.org>
Date: Wed, 11 Jun 2008 15:48:27 +0000 (+0000)
Subject: merge of '6aa3a34371e0ba98066d355ab1bc9a3c72356bf0'
X-Git-Tag: Release-2010-05/1~6768^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ff424897ffa847b198072c53bf40ec06961a8ef;p=openembedded.git

Merge ... '6aa3a34371e0ba98066d355ab1bc9a3c72356bf0'
     and '99ed4d92c897fb19999e63a3d7eb3b5fae762ff3'
---

3ff424897ffa847b198072c53bf40ec06961a8ef