From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 28 Nov 2007 13:47:18 +0000 (+0000)
Subject: merge of '1e54b4f2db4e8ef4f33743de51d73d55e8b83a96'
X-Git-Tag: Release-2010-05/1~8265
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e62d4f8fe52a7f84ae5b17079b05403e9d1c8629;p=openembedded.git

Merge ... '1e54b4f2db4e8ef4f33743de51d73d55e8b83a96'
     and '33e5bd40976428aea7682da1e3cb6ed9c93af23e'
---

e62d4f8fe52a7f84ae5b17079b05403e9d1c8629