From: Robert Schuster <thebohemian@gmx.net>
Date: Sun, 10 Feb 2008 02:42:41 +0000 (+0000)
Subject: merge of '4789fc4a55cdb58c5a1185215e671251be522827'
X-Git-Tag: Release-2010-05/1~7696^2~11^2~6^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d9f69b80f99932db142fbb6fb59151c66befebb;p=openembedded.git

Merge ... '4789fc4a55cdb58c5a1185215e671251be522827'
     and 'ce15bdbb89211863b43db8fc56de6aaf8a0dd4f7'
---

9d9f69b80f99932db142fbb6fb59151c66befebb