From: Matthias Hentges <oe@hentges.net>
Date: Thu, 29 Nov 2007 17:58:08 +0000 (+0000)
Subject: merge of '4688c77d9f496fd36f6b1845f37bc3c42af85968'
X-Git-Tag: Release-2010-05/1~8253^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74947ce74fbbfd607822b5517a02e1f24c22043a;p=openembedded.git

Merge ... '4688c77d9f496fd36f6b1845f37bc3c42af85968'
     and 'dd83c0ba4e83a6207462418b614431ce061d9481'
---

74947ce74fbbfd607822b5517a02e1f24c22043a