From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 7 Jan 2008 23:55:54 +0000 (+0000)
Subject: merge of '676ed5b61806189cd1aeea21920d3c8fa842f8c7'
X-Git-Tag: Release-2010-05/1~7987^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=939f5d55c0e4e5d9b9f04f341c848cec4e226d6b;p=openembedded.git

Merge ... '676ed5b61806189cd1aeea21920d3c8fa842f8c7'
     and 'f556521018478109967b108bb830f8109aefbb0e'
---

939f5d55c0e4e5d9b9f04f341c848cec4e226d6b