From: Philip Balister <philip@balister.org>
Date: Sat, 28 Oct 2006 13:48:12 +0000 (+0000)
Subject: merge of '9bb5aacf211c840ef28190458936fec0e3163a18'
X-Git-Tag: Release-2010-05/1~9453^2~567^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a84ca6515375010be1cb18ec82ec48968b89bb84;p=openembedded.git

Merge ... '9bb5aacf211c840ef28190458936fec0e3163a18'
     and 'a89f7dd0fbeeb4f5627838591cb356337a0b5ae2'
---

a84ca6515375010be1cb18ec82ec48968b89bb84