From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Sat, 1 Jul 2006 17:39:27 +0000 (+0000)
Subject: merge of 9c951cf8a21c82b4eabd9def7e39018b72a58207
X-Git-Tag: Release-2010-05/1~9453^2~1385^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5770cef667b87b1565d33331521c55a8c88c083c;p=openembedded.git

merge of 9c951cf8a21c82b4eabd9def7e39018b72a58207
     and d50b000eb72487fd8f053761eb15160cf5e56976
---

5770cef667b87b1565d33331521c55a8c88c083c