From: Philip Balister <philip@balister.org>
Date: Wed, 10 Jan 2007 11:56:54 +0000 (+0000)
Subject: merge of '8ec6936842d2420f6d2a56139b8385575ba9e27e'
X-Git-Tag: Release-2010-05/1~9360^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec9b38a8bc554452f2c0fafc83d1e6540e514713;p=openembedded.git

Merge ... '8ec6936842d2420f6d2a56139b8385575ba9e27e'
     and 'f4b3e06f33fc327501dbed067c7324a3fe7234e3'
---

ec9b38a8bc554452f2c0fafc83d1e6540e514713