From: Philip Balister <philip@balister.org>
Date: Tue, 15 May 2007 16:59:47 +0000 (+0000)
Subject: merge of '36a3e8d1c238807062d51987c38ef05ebad7767c'
X-Git-Tag: Release-2010-05/1~8868^2~493
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3566a861498bd0fa8c9e9fec093561fbc6daaaa3;p=openembedded.git

Merge ... '36a3e8d1c238807062d51987c38ef05ebad7767c'
     and '56ba744369ba7e91f99f26ec49b2be38baff69d9'
---

3566a861498bd0fa8c9e9fec093561fbc6daaaa3