From: Philip Balister <philip@balister.org>
Date: Sat, 1 Dec 2007 14:17:01 +0000 (+0000)
Subject: merge of '0520dc5ac68960d1ddad4df9a54a1c8375eccb5f'
X-Git-Tag: Release-2010-05/1~8243
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=269044be2431a2efc5cf31a956e9d6096f575370;p=openembedded.git

Merge ... '0520dc5ac68960d1ddad4df9a54a1c8375eccb5f'
     and '7ae6a85e45951bf75ee4d7b23b7c8dd7e0be1000'
---

269044be2431a2efc5cf31a956e9d6096f575370