From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 19 Apr 2007 13:24:27 +0000 (+0000)
Subject: merge of '921da5f2f44b585cfc717d57b56eca8274846fc5'
X-Git-Tag: Release-2010-05/1~8868^2~683^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cb30448a6a49bbed4037a0e68b93c64702b8ebc;p=openembedded.git

Merge ... '921da5f2f44b585cfc717d57b56eca8274846fc5'
     and 'e42d193ca7a0f868e261161afe5071382329b48b'
---

4cb30448a6a49bbed4037a0e68b93c64702b8ebc