From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 4 Sep 2006 13:48:07 +0000 (+0000)
Subject: merge of 5d227caceeb62ba64050a701f15f08f65bd5f723
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2~1^2^2^2~1^2^2~1^2^2^2^2~5^2~1^2^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95a54eaf67942bee9197e4d92d134d8ec8de2336;p=openembedded.git

merge of 5d227caceeb62ba64050a701f15f08f65bd5f723
     and 7ecc11dbf2cc1308396b89a4fdb083478bf63388
---

95a54eaf67942bee9197e4d92d134d8ec8de2336