From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Tue, 29 Aug 2006 09:32:05 +0000 (+0000)
Subject: merge of 'a7f77b321a367b9f9968493707b5bbf8b6964b50'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb616a13fa3af7aac33be630a0f08a81f158e8ab;p=openembedded.git

Merge ... 'a7f77b321a367b9f9968493707b5bbf8b6964b50'
     and 'e69ec8c22b9de95c8926c3818775337d0ad13c8a'
---

eb616a13fa3af7aac33be630a0f08a81f158e8ab