From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Wed, 27 Jun 2007 02:57:36 +0000 (+0000)
Subject: merge of '99cbcc8e87c723d0a9e1a7c858d8001fc155c6ec'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=757c8cfe4ec252f50fca7e67292911e758036a37;p=openembedded.git

Merge ... '99cbcc8e87c723d0a9e1a7c858d8001fc155c6ec'
     and 'b3a5d98a7f1c8586a53bf99549d0abe02ce9d8b4'
---

757c8cfe4ec252f50fca7e67292911e758036a37