From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 13 Dec 2006 12:17:09 +0000 (+0000)
Subject: merge of 21188e8c51279bd1abd8427a3340581138eaeca3
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2^2~1^2^2^2^2~6^2~2^2~2^2~1^2~1^2~1^2^2^2^2^2~1^2^2^2^2^2~4^2~2^2~3^2^2~1^2~1^2^2~2^2~4^2^2^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e696e2bdac68c106c544cf917302eb0b96a667b;p=openembedded.git

merge of 21188e8c51279bd1abd8427a3340581138eaeca3
     and d4b34a17ff4133d0be64c86a6f6ac6a1541f7fd5
---

9e696e2bdac68c106c544cf917302eb0b96a667b