From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 29 Sep 2007 19:41:47 +0000 (+0000)
Subject: merge of '13230c328dd36efab674e56c004cc0813e282791'
X-Git-Tag: Release-2010-05/1~8556
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47d1abcfd90ae1cbaa7c3b99b93e8e748aefa181;p=openembedded.git

Merge ... '13230c328dd36efab674e56c004cc0813e282791'
     and '2e2e83df3f2d7c5eaea7ab84b89fe681a0267e54'
---

47d1abcfd90ae1cbaa7c3b99b93e8e748aefa181