From: Philip Balister <philip@balister.org>
Date: Fri, 17 Aug 2007 14:01:51 +0000 (+0000)
Subject: merge of '8f0990c1c2ac36fbc06162157be83ae04403f8c6'
X-Git-Tag: Release-2010-05/1~8939^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3354e1310d6bf79bf8d6586fdcdf1361ae4036fd;p=openembedded.git

Merge ... '8f0990c1c2ac36fbc06162157be83ae04403f8c6'
     and 'f4c81cd8dcea8c89262f32820d6f3764c5622e2a'
---

3354e1310d6bf79bf8d6586fdcdf1361ae4036fd