From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 11 May 2006 16:49:14 +0000 (+0000)
Subject: merge of 20d82b867694bc656456a80553cb61e3496c6971
X-Git-Tag: Release-2010-05/1~9453^2~1719^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01863d57ffb035ad0cc64aa273d6a13d28bae787;p=openembedded.git

merge of 20d82b867694bc656456a80553cb61e3496c6971
     and 3218f01f2326060a12ef6708b1b8a120b220d5a9
---

01863d57ffb035ad0cc64aa273d6a13d28bae787