From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 25 Mar 2008 07:34:23 +0000 (+0000)
Subject: merge of '55b6b2c132d8b0a81bcec0deed383a3da45e39e8'
X-Git-Tag: Release-2010-05/1~7280
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80e765ba6f2c395006d82251bea0b3590b277dff;p=openembedded.git

Merge ... '55b6b2c132d8b0a81bcec0deed383a3da45e39e8'
     and '67254ac9ecc3abdbf0b718b05d6eaa8d6b4b6e92'
---

80e765ba6f2c395006d82251bea0b3590b277dff