From: Jan Lübbe <jluebbe@debian.org>
Date: Tue, 22 Jul 2008 15:50:44 +0000 (+0000)
Subject: merge of '832167cf1cc0ab655072532b7c546a8a25821e44'
X-Git-Tag: Release-2010-05/1~6490^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d389748f6ba4325a878f7e3c017b1905409c8700;p=openembedded.git

Merge ... '832167cf1cc0ab655072532b7c546a8a25821e44'
     and 'e4aab546c3b33577e2fb6bcfe199da5a98b4a9a3'
---

d389748f6ba4325a878f7e3c017b1905409c8700