From: Philip Balister <philip@balister.org>
Date: Thu, 2 Aug 2007 19:23:45 +0000 (+0000)
Subject: merge of '5b34006a886a797a6d06678129380ba60e87a9d8'
X-Git-Tag: Release-2010-05/1~8868^2~36
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bc7cd5e4d2b9b0c75fee595a387cb2808d22008;p=openembedded.git

Merge ... '5b34006a886a797a6d06678129380ba60e87a9d8'
     and '61f3fd528334e7f514021b99ecf6ab6cf271760a'
---

1bc7cd5e4d2b9b0c75fee595a387cb2808d22008