From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 29 Mar 2008 03:00:12 +0000 (+0000)
Subject: merge of '641cb531f5b8a986da7de7e34632a36c15b6c3ca'
X-Git-Tag: Release-2010-05/1~7258
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3305bd33e0e4ebe3907018393ddf1176a3369d6;p=openembedded.git

Merge ... '641cb531f5b8a986da7de7e34632a36c15b6c3ca'
     and 'd3bc42a7b3cb02bf7be09e8aae8fd99960be84b7'
---

d3305bd33e0e4ebe3907018393ddf1176a3369d6