From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Tue, 8 Aug 2006 16:36:52 +0000 (+0000)
Subject: merge of a2b72038a75fbaa0877614758b62b3787a0937a4
X-Git-Tag: Release-2010-05/1~9453^2~996^2~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3edf84491e44049eecaa83f73625190694a6177e;p=openembedded.git

merge of a2b72038a75fbaa0877614758b62b3787a0937a4
     and ade4046c4fc13b91526f334d6ca6f33972b6ff8c
---

3edf84491e44049eecaa83f73625190694a6177e