From: Matthias Hentges <oe@hentges.net>
Date: Fri, 28 Dec 2007 14:42:59 +0000 (+0000)
Subject: merge of '13f44cdbfe324214f1eaf83010654d1baabf59c2'
X-Git-Tag: Release-2010-05/1~8069^2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31e564d9f071df9fb605197e27025eecf15dde72;p=openembedded.git

Merge ... '13f44cdbfe324214f1eaf83010654d1baabf59c2'
     and 'be0c074741a0dccdd6fa957ac43f2c44be640046'
---

31e564d9f071df9fb605197e27025eecf15dde72