From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 8 Jul 2006 14:29:36 +0000 (+0000)
Subject: merge of 80526ab06e22a8188d5bbf6c96c91a93e182c7c9
X-Git-Tag: Release-2010-05/1~9453^2~1287^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaed825f7dbded762361f9e8d8866f34eee7a60a;p=openembedded.git

merge of 80526ab06e22a8188d5bbf6c96c91a93e182c7c9
     and 8ef2255951429792652b6d09bbad4841a438e89b
---

aaed825f7dbded762361f9e8d8866f34eee7a60a