From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 10 Jul 2007 21:57:23 +0000 (+0000)
Subject: merge of '1de364fbbc0efdbe8f12facadb69f65193d6402b'
X-Git-Tag: Release-2010-05/1~8868^2~176^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6cb8f55812b954a8964b56e6c872df9cc39e7cd;p=openembedded.git

Merge ... '1de364fbbc0efdbe8f12facadb69f65193d6402b'
     and '9a6a3b6cdbc4ad0d70f25990c813207b33b2a5a2'
---

f6cb8f55812b954a8964b56e6c872df9cc39e7cd