From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 18 Oct 2006 08:48:58 +0000 (+0000)
Subject: merge of '2890e8a41d4b56afa08fe908f7c38d5dc6d65269'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~113
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4ceff69dc72ecb32acf104154524731748fca23;p=openembedded.git

Merge ... '2890e8a41d4b56afa08fe908f7c38d5dc6d65269'
     and 'ab0313a11e170f4e88a966dfdf5b90ab36ca4ccb'
---

b4ceff69dc72ecb32acf104154524731748fca23