From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 16 Jan 2008 04:37:45 +0000 (+0000)
Subject: merge of '3caac13a21da93a3af0a8093fe60883fccd0399f'
X-Git-Tag: Release-2010-05/1~7894^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a5b423edc8916074c097d1e7dc2219f2c38228c;p=openembedded.git

Merge ... '3caac13a21da93a3af0a8093fe60883fccd0399f'
     and '3d85f32ae343659587f7a1f2da9e4a8ed3e568a1'
---

3a5b423edc8916074c097d1e7dc2219f2c38228c