From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 7 May 2006 12:08:50 +0000 (+0000)
Subject: merge of 745f481b6c45cddfd77a92cad262092f8ce0dd05
X-Git-Tag: Release-2010-05/1~9453^2~1761
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0d29ea51fe686bd32573f7bab1622758520b32c;p=openembedded.git

merge of 745f481b6c45cddfd77a92cad262092f8ce0dd05
     and 8aa7d9ca8a4bc9f72eab0dc5bb4b93ffc8204e55
---

c0d29ea51fe686bd32573f7bab1622758520b32c