From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 12 Apr 2007 08:09:52 +0000 (+0000)
Subject: merge of 'a1f473400955efaaf8f95efbbace1f8641423de0'
X-Git-Tag: Release-2010-05/1~8868^2~702
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f6286f32d40b71c4819bdcf3ecd70ca062b1d73;p=openembedded.git

Merge ... 'a1f473400955efaaf8f95efbbace1f8641423de0'
     and 'aee4afc7bd079e28f35b43cc08b0559015472e42'
---

5f6286f32d40b71c4819bdcf3ecd70ca062b1d73