From: Philip Balister <philip@balister.org>
Date: Fri, 23 May 2008 18:16:18 +0000 (+0000)
Subject: merge of '8104662b136ce70b58ae47f1c87a35fb7a8e242c'
X-Git-Tag: Release-2010-05/1~6880
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4529bc58d0a34fca989f49db6c28e4c65c0bfc2;p=openembedded.git

Merge ... '8104662b136ce70b58ae47f1c87a35fb7a8e242c'
     and 'ba423ff965670136ffbda3d58e4debf5c627ce3b'
---

f4529bc58d0a34fca989f49db6c28e4c65c0bfc2