From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 26 Aug 2006 23:16:30 +0000 (+0000)
Subject: merge of 173720b79189de0792917607079901afb06ac4c9
X-Git-Tag: Release-2010-05/1~9453^2~837^2~1^2^2~1^2~3^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e996e44c06bb66631e2e08f50ff06cc855a0319;p=openembedded.git

merge of 173720b79189de0792917607079901afb06ac4c9
     and 79739dff83f642e3496fd0b3a72e803e4ce27fbf
---

9e996e44c06bb66631e2e08f50ff06cc855a0319