From: Graeme Gregory <dp@xora.org.uk>
Date: Sun, 27 Aug 2006 17:20:35 +0000 (+0000)
Subject: merge of '31791b517fd0fdc4e50c48d20a836408a23727d3'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~59
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69383bc09ea895755f1ed236c686e5c6cdf9ced7;p=openembedded.git

Merge ... '31791b517fd0fdc4e50c48d20a836408a23727d3'
     and 'ce3b6559d2cb3ba65a6dd0f69e76c890fe48f129'
---

69383bc09ea895755f1ed236c686e5c6cdf9ced7