From: Matthias Hentges <oe@hentges.net>
Date: Fri, 4 Jan 2008 14:10:51 +0000 (+0000)
Subject: merge of '8015a13e63ef13c856f4a5a5f4e9b1fa3f143fa8'
X-Git-Tag: Release-2010-05/1~8023
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b3b57dfa59ae7b222455468b9618a74a65e6c96;p=openembedded.git

Merge ... '8015a13e63ef13c856f4a5a5f4e9b1fa3f143fa8'
     and '85ea4469c6c02accbb588d6edee46fd9a00ad12d'
---

6b3b57dfa59ae7b222455468b9618a74a65e6c96