From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 26 Mar 2006 22:28:25 +0000 (+0000)
Subject: merge of 2e715e0002b1abd606680bde1f426f3384e1863a
X-Git-Tag: Release-2010-05/1~9453^2~2117^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49de111e7100b173dedad323fa7537bd4b362c37;p=openembedded.git

merge of 2e715e0002b1abd606680bde1f426f3384e1863a
     and b2304690cc6d600f6d72f824769d026ba7fbe63c
---

49de111e7100b173dedad323fa7537bd4b362c37