From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Wed, 27 Aug 2008 16:22:56 +0000 (+0000)
Subject: merge of '0e9b0714e6ab764eaa6afb85fbd5d15b41175604'
X-Git-Tag: Release-2010-05/1~6226
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a60e8d2d9220e02966c8cf776b5c593831f345b;p=openembedded.git

Merge ... '0e9b0714e6ab764eaa6afb85fbd5d15b41175604'
     and '45a9c4a970e79c5b8343a4a4ff110589bcc19d2f'
---

5a60e8d2d9220e02966c8cf776b5c593831f345b