From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 7 Feb 2007 15:21:25 +0000 (+0000)
Subject: merge of '6532e26aa38ae6a2b6f815a67a5c317d6fe32c3f'
X-Git-Tag: Release-2010-05/1~9271
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f8c8ce6db7bb1ae55636b85cef0698656b5aa9c;p=openembedded.git

Merge ... '6532e26aa38ae6a2b6f815a67a5c317d6fe32c3f'
     and '69feaf31348d8a4d64d89a199b72e466ba009c78'
---

9f8c8ce6db7bb1ae55636b85cef0698656b5aa9c