From: Philip Balister <philip@balister.org>
Date: Fri, 3 Aug 2007 14:40:38 +0000 (+0000)
Subject: merge of '1cdc457f64f3451940bcf06c52bbc5dd90e86a1e'
X-Git-Tag: Release-2010-05/1~8868^2~28
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ac754c8557bc8675ec9a8bddbe92e7c9e6b66a5;p=openembedded.git

Merge ... '1cdc457f64f3451940bcf06c52bbc5dd90e86a1e'
     and '6897ab6243e36c667763f309198c961dba118378'
---

6ac754c8557bc8675ec9a8bddbe92e7c9e6b66a5