From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 21 Oct 2006 21:38:31 +0000 (+0000)
Subject: merge of 14bd8d9b654cd46ec71ba3b5312ad1d28ec2550e
X-Git-Tag: Release-2010-05/1~9453^2~567^2~49^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18cd5fdfe971d1054e00036215b7989bf3444115;p=openembedded.git

merge of 14bd8d9b654cd46ec71ba3b5312ad1d28ec2550e
     and dd230f1511e357183e0d179a16d60af7265a8cf1
---

18cd5fdfe971d1054e00036215b7989bf3444115