From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 21 Jun 2007 11:03:12 +0000 (+0000)
Subject: merge of '0092188379e9f72acfeb7af2b132c12554d8a515'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d3d8eb6a259355868b3aa7267c1ccb280b70c87;p=openembedded.git

Merge ... '0092188379e9f72acfeb7af2b132c12554d8a515'
     and 'e89c096197c1edb468e2fa9e49482a06b639bf1e'
---

2d3d8eb6a259355868b3aa7267c1ccb280b70c87