From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Wed, 9 Aug 2006 13:07:57 +0000 (+0000)
Subject: merge of 1d04ef5038d67cd195b55d02d4973c0a4a074264
X-Git-Tag: Release-2010-05/1~9453^2~996^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6bc829ae2d1bf9020b1fb22e50607c13eab324e;p=openembedded.git

merge of 1d04ef5038d67cd195b55d02d4973c0a4a074264
     and 4c592719442f4293fbdcccad6c024f161bedb8c8
---

e6bc829ae2d1bf9020b1fb22e50607c13eab324e