From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 16 Feb 2006 23:25:57 +0000 (+0000)
Subject: merge of 397e16c7ee39422a928815c8f39b1d8aa619daec
X-Git-Tag: Release-2010-05/1~9453^2~2337
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d5cdacd570300eeb4bf299de0da2f105c3e5b99;p=openembedded.git

merge of 397e16c7ee39422a928815c8f39b1d8aa619daec
     and 5964138bce1427aaaa36a1953c3090063a8da2de
---

1d5cdacd570300eeb4bf299de0da2f105c3e5b99