From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 24 Mar 2006 10:28:25 +0000 (+0000)
Subject: merge of bcb91ddbe21b7a5889fe98f3853d19ddcb2471cb
X-Git-Tag: Release-2010-05/1~9453^2~2125
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29897e4068b700d0a3258d16184b86d239f9169b;p=openembedded.git

merge of bcb91ddbe21b7a5889fe98f3853d19ddcb2471cb
     and ff499565cdf6658417de4beeeba44d618266fd0d
---

29897e4068b700d0a3258d16184b86d239f9169b