From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 26 Dec 2006 17:17:18 +0000 (+0000)
Subject: merge of 469700449a3e130b38c90091651ec45455b58895
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~3^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bbb4b94e191799a5be2cc92ba648afe43b99c17;p=openembedded.git

merge of 469700449a3e130b38c90091651ec45455b58895
     and bb0b574e4eebfa7477f1807d005a18b71eaacc49
---

6bbb4b94e191799a5be2cc92ba648afe43b99c17