From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 2 Jan 2006 16:14:05 +0000 (+0000)
Subject: merge of 68dc68630ef5f8cb5f392a2b722b9e4df487594d
X-Git-Tag: Release-2010-05/1~9453^2~2801
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23f06f8a938e6bbf21fd33688ca9fb1744d14315;p=openembedded.git

merge of 68dc68630ef5f8cb5f392a2b722b9e4df487594d
     and e3e867b6681848568f2694833afb3a3a08b8fa48
---

23f06f8a938e6bbf21fd33688ca9fb1744d14315