From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 1 Aug 2006 14:05:57 +0000 (+0000)
Subject: merge of '3cbbfcc1e2fab12fbc6b032fc4ea76618c77c318'
X-Git-Tag: Release-2010-05/1~9453^2~1027^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4a1644dec42a8dfe6a4950592f36fc9d43e1bb8;p=openembedded.git

Merge ... '3cbbfcc1e2fab12fbc6b032fc4ea76618c77c318'
     and 'ee7b821b10b13b9938b5844392093bd7e294c01a'
---

a4a1644dec42a8dfe6a4950592f36fc9d43e1bb8