From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 28 Mar 2008 03:58:54 +0000 (+0000)
Subject: merge of '19f950ca4a0d912a0ac8680d3b82d52f11fc2cd0'
X-Git-Tag: Release-2010-05/1~7260^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ef28fa6f42e75594369f950ecc2046e200f67c8;p=openembedded.git

Merge ... '19f950ca4a0d912a0ac8680d3b82d52f11fc2cd0'
     and 'dd15f7f49322c01bcd6b9e0738b3452ab727d348'
---

2ef28fa6f42e75594369f950ecc2046e200f67c8