From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 27 Aug 2006 17:34:53 +0000 (+0000)
Subject: merge of '47d9bffa351513f062299f9ac77e39b7bfe6d74f'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~57^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2101f6f377a76c373b5ef4ff2fb8484ab5d4d31f;p=openembedded.git

Merge ... '47d9bffa351513f062299f9ac77e39b7bfe6d74f'
     and 'b4baa952a21796f3da8adaf6acd8c844668a33d8'
---

2101f6f377a76c373b5ef4ff2fb8484ab5d4d31f