From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 18 Jan 2006 15:39:17 +0000 (+0000)
Subject: merge of f8284bbff196fac15cb8c1b32ae2ac3dcda6a7a8
X-Git-Tag: Release-2010-05/1~9453^2~2627
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d60e06669abb89149ba60248ee6b72b6a274f04;p=openembedded.git

merge of f8284bbff196fac15cb8c1b32ae2ac3dcda6a7a8
     and 856b33429f931b2e6a9dab859111ff4c8b6111c2
---

8d60e06669abb89149ba60248ee6b72b6a274f04