From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 25 Aug 2006 10:31:22 +0000 (+0000)
Subject: merge of bccc39ddc3a30dc4cb16ae8fb2bd3257a1ea2096
X-Git-Tag: Release-2010-05/1~9453^2~837^2~1^2^2~1^2~3^2~1^2~1^2^2^2^2^2^2~2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4998c9127760da2dd58e9a56a5f724ba7e654cdf;p=openembedded.git

merge of bccc39ddc3a30dc4cb16ae8fb2bd3257a1ea2096
     and e0b052b513b17e533813c5e89fcf251d1d8e6588
---

4998c9127760da2dd58e9a56a5f724ba7e654cdf