From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 24 Dec 2007 05:36:11 +0000 (+0000)
Subject: merge of 'b5c1b60665cc492c4cad02a57e687ae33b5ce2ec'
X-Git-Tag: Release-2010-05/1~8113^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c90419ff013a99a1b0c147a525675691eb74ab9b;p=openembedded.git

Merge ... 'b5c1b60665cc492c4cad02a57e687ae33b5ce2ec'
     and 'd31f98aad124b724f9685f080dbcdb5bd97d183f'
---

c90419ff013a99a1b0c147a525675691eb74ab9b