From: Philip Balister <philip@balister.org>
Date: Thu, 16 Aug 2007 21:45:57 +0000 (+0000)
Subject: merge of 'e1d538a40dd18336f9f3f275226a93557d9741cf'
X-Git-Tag: Release-2010-05/1~8946
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1aeb81320d30622f09609f5569d302d527b3cef7;p=openembedded.git

Merge ... 'e1d538a40dd18336f9f3f275226a93557d9741cf'
     and 'e6ff7fada36b2dd0f2a75f05cada2bc073f0bd4b'
---

1aeb81320d30622f09609f5569d302d527b3cef7