From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 23 Dec 2006 21:32:19 +0000 (+0000)
Subject: merge of 07869413caf55a45b7b829f157f9ce531f8538da
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70b095448027097225cd1f41239261bafc982d21;p=openembedded.git

merge of 07869413caf55a45b7b829f157f9ce531f8538da
     and 81ad048dfdc6a3a80a0a2fa696910b31ad099b1d
---

70b095448027097225cd1f41239261bafc982d21