From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 12 Jul 2006 21:36:47 +0000 (+0000)
Subject: merge of 7484256711bab20f56c5b8cfe94ae9c4a0fac36a
X-Git-Tag: Release-2010-05/1~9453^2~1236
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=738a9bde53edf9462237240a72fd8bfd867f8b2e;p=openembedded.git

merge of 7484256711bab20f56c5b8cfe94ae9c4a0fac36a
     and b2faac906eea0c47c1b5d14cff00776242589b25
---

738a9bde53edf9462237240a72fd8bfd867f8b2e