From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 16 Jun 2008 11:12:45 +0000 (+0000)
Subject: merge of '02ce8fba2c16b03770277a744efebc4f9c0f7f47'
X-Git-Tag: Release-2010-05/1~6681
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3981575226bc2a1f5aaaf829139005e443eec8ba;p=openembedded.git

Merge ... '02ce8fba2c16b03770277a744efebc4f9c0f7f47'
     and '1ca4c522d6f876b0f973239befedba5f6ad6ab07'
---

3981575226bc2a1f5aaaf829139005e443eec8ba