From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 7 Sep 2007 23:13:39 +0000 (+0000)
Subject: merge of 'ae89f1087a609da6b249b64690b468f4dcfcceee'
X-Git-Tag: Release-2010-05/1~8701^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba437885e824f26a25aa44d67c1cc199c1c7c9da;p=openembedded.git

Merge ... 'ae89f1087a609da6b249b64690b468f4dcfcceee'
     and 'b6d3200d932c1e277015164a4e83ea009d96872f'
---

ba437885e824f26a25aa44d67c1cc199c1c7c9da