From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 25 Mar 2008 04:00:25 +0000 (+0000)
Subject: merge of '95ddd65a9c9a2104b071c450f7b75de0533a9a13'
X-Git-Tag: Release-2010-05/1~7280^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc02b41d392b6fce7a50e992de6b5b2234bab183;p=openembedded.git

Merge ... '95ddd65a9c9a2104b071c450f7b75de0533a9a13'
     and 'e827e49beb99d448d8fffea3f155c549865b2e84'
---

bc02b41d392b6fce7a50e992de6b5b2234bab183