From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 1 Feb 2008 15:32:54 +0000 (+0000)
Subject: merge of '3df50a7108e4f25287e1ae4e52bfb7bc1aa7e2df'
X-Git-Tag: Release-2010-05/1~7765^2~11^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bacf80851c83bce91087a0b0da4299c3f3094c4;p=openembedded.git

Merge ... '3df50a7108e4f25287e1ae4e52bfb7bc1aa7e2df'
     and 'cb775f550e7bb6db676bbeebfc81eee971afcf27'
---

0bacf80851c83bce91087a0b0da4299c3f3094c4