From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 29 Jul 2006 16:04:46 +0000 (+0000)
Subject: merge of 261f8a4167761b16158724a65abdf147c333aefb
X-Git-Tag: Release-2010-05/1~9453^2~1063
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afec6583347a94eaa5d80caf2ae48f5e3600fdd4;p=openembedded.git

merge of 261f8a4167761b16158724a65abdf147c333aefb
     and f013fa49cf51e608648d80a83a4941c4900ebfd9
---

afec6583347a94eaa5d80caf2ae48f5e3600fdd4