From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 20 Mar 2008 13:11:58 +0000 (+0000)
Subject: merge of '20b213bec4f076e1fb00a34a7a51a2905159ffc0'
X-Git-Tag: Release-2010-05/1~7313^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6b9e19d25e4a54fac41f01dce252f3c93fe6a6e;p=openembedded.git

Merge ... '20b213bec4f076e1fb00a34a7a51a2905159ffc0'
     and 'ad97e9f544970d2dff4dfc87eeef79ab2ecac87a'
---

c6b9e19d25e4a54fac41f01dce252f3c93fe6a6e