From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 25 Dec 2006 10:50:15 +0000 (+0000)
Subject: merge of 2c2427ae9aeb6ca358a92e745e1051f1d06134df
X-Git-Tag: Release-2010-05/1~9453^2~116
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cc373e182132d29d1d2dccf849c6919267a906f;p=openembedded.git

merge of 2c2427ae9aeb6ca358a92e745e1051f1d06134df
     and 65c95bf6c423272c963b3df3c62c0fcee9c7cf71
---

5cc373e182132d29d1d2dccf849c6919267a906f