From: Mike Westerhof <mwester@dls.net>
Date: Wed, 21 Feb 2007 16:24:40 +0000 (+0000)
Subject: merge of '508460bd20240e74c9d21f9fbb4fe69da118928e'
X-Git-Tag: Release-2010-05/1~9174
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d0de2512caa025d306b937a414b8edf10ab2b23;p=openembedded.git

Merge ... '508460bd20240e74c9d21f9fbb4fe69da118928e'
     and 'db725bcc14971edf3f7b52d7083ab60cbda61a40'
---

1d0de2512caa025d306b937a414b8edf10ab2b23