From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 24 Dec 2007 13:36:38 +0000 (+0000)
Subject: merge of '1585e84b2f1f1c143a60c4d80cd9b5f9dfd1bfa7'
X-Git-Tag: Release-2010-05/1~8109
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56925a146ae316502cc187bc9ec1fc24428a3020;p=openembedded.git

Merge ... '1585e84b2f1f1c143a60c4d80cd9b5f9dfd1bfa7'
     and 'a0bced98fc660149756ffa812a313c6b5fdbeaa1'
---

56925a146ae316502cc187bc9ec1fc24428a3020