From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 1 Dec 2007 14:20:01 +0000 (+0000)
Subject: merge of '0520dc5ac68960d1ddad4df9a54a1c8375eccb5f'
X-Git-Tag: Release-2010-05/1~8242^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdf5a003fdaeba376c9ec1aa0a0b305f8dc4fcb8;p=openembedded.git

Merge ... '0520dc5ac68960d1ddad4df9a54a1c8375eccb5f'
     and 'f31acbcc26f0c26226e19e7d8c547973cf9a473b'
---

fdf5a003fdaeba376c9ec1aa0a0b305f8dc4fcb8