From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 31 Oct 2007 11:29:11 +0000 (+0000)
Subject: merge of '55dbe512554ea028b2d4722048c4e9d4a958022c'
X-Git-Tag: Release-2010-05/1~8454^2~38^2~3^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e123dfde5301965e1e7700e228b21c2652c2687;p=openembedded.git

Merge ... '55dbe512554ea028b2d4722048c4e9d4a958022c'
     and '6aff048ce0e2244277e9b1398c4a400bdd758e30'
---

8e123dfde5301965e1e7700e228b21c2652c2687