From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Wed, 28 Mar 2007 15:33:37 +0000 (+0000)
Subject: merge of '6707ea8938041e96005d0679000abd73cf4a19f2'
X-Git-Tag: Release-2010-05/1~8868^2~946^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc8325b1fb8a380182d6bb2167aa116d620c4f79;p=openembedded.git

Merge ... '6707ea8938041e96005d0679000abd73cf4a19f2'
     and 'e0bcd233b4b12fb5617b279912d21d48054a5500'
---

cc8325b1fb8a380182d6bb2167aa116d620c4f79