From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 25 Dec 2006 11:02:09 +0000 (+0000)
Subject: merge of 469f1eb1ad527334a8c5f9143e791be88ede9109
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~3^2~1^2~1^2^2^2~2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bab507bb2544ad9c02c351973cac0761b020dde2;p=openembedded.git

merge of 469f1eb1ad527334a8c5f9143e791be88ede9109
     and ece1da3b26b2e74ff0f8c01bf13b7840562b6d55
---

bab507bb2544ad9c02c351973cac0761b020dde2