From: Philip Balister <philip@balister.org>
Date: Sun, 22 Oct 2006 22:31:09 +0000 (+0000)
Subject: merge of '26e66d3e313fcde6d3a34f92e9f62370dbf7e7cf'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~30
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9da76f0fa1bcbe23adce375c7fe31de6e59e788b;p=openembedded.git

Merge ... '26e66d3e313fcde6d3a34f92e9f62370dbf7e7cf'
     and 'e54c56238fe449408b7d1a0c3acf7efa72725277'
---

9da76f0fa1bcbe23adce375c7fe31de6e59e788b