From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 28 Aug 2007 13:33:34 +0000 (+0000)
Subject: merge of '5f655daae211bb56e41cac62621d6f18543c5bd2'
X-Git-Tag: Release-2010-05/1~8789^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d9792a4505c70d8f1608e031fbccbcb5d752336;p=openembedded.git

Merge ... '5f655daae211bb56e41cac62621d6f18543c5bd2'
     and '6fc40d7a0fd4df5006df760583d8e2e7e87d80b1'
---

2d9792a4505c70d8f1608e031fbccbcb5d752336